summaryrefslogtreecommitdiffstats
path: root/test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/other_branch
blob: cb2cf343757b2c97e91f4a65e7ff73590f390f92 (plain) 
1
2
3

0000000000000000000000000000000000000000 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI <CI@example.com> 1617671441 +1000	branch: Created from HEAD
0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 562af0640203fb5a6e92c090d8d1ded26806d2c4 CI <CI@example.com> 1617671444 +1000	commit: asd
562af0640203fb5a6e92c090d8d1ded26806d2c4 f8dd12b796f400be7f59d9471670c3080f9c90a1 CI <CI@example.com> 1617671461 +1000	commit (merge): Merge branch 'develop' into other_branch
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-31 11:25:33 +0000