summaryrefslogtreecommitdiffstats
path: root/test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/master
blob: 3ac4fad1782d57f6376c7ece5c7d82a7baef9bf1 (plain)
1
2
3
4
5
0000000000000000000000000000000000000000 1618ce1085acb41fd710e279ac38911aadfb0a09 CI <CI@example.com> 1617671441 +1000	commit (initial): first commit
1618ce1085acb41fd710e279ac38911aadfb0a09 f89097f0bd23eda6d8977c0edfae7f913ffc5db3 CI <CI@example.com> 1617671441 +1000	commit: first commit on master
f89097f0bd23eda6d8977c0edfae7f913ffc5db3 a19ec0b99e516795f349033f09383f87be0b74e9 CI <CI@example.com> 1617671441 +1000	commit: second commit on master
a19ec0b99e516795f349033f09383f87be0b74e9 61db24350a92fa37b2fe35f13eb3dd3f7655f6cf CI <CI@example.com> 1617671441 +1000	commit: third commit on master
61db24350a92fa37b2fe35f13eb3dd3f7655f6cf 559043765dc6c32c943b6278b4abbff1e6f52839 CI <CI@example.com> 1617671441 +1000	commit: fourth commit on master