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

0000000000000000000000000000000000000000 559043765dc6c32c943b6278b4abbff1e6f52839 CI <CI@example.com> 1617671441 +1000	branch: Created from HEAD
559043765dc6c32c943b6278b4abbff1e6f52839 0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 CI <CI@example.com> 1617671441 +1000	commit: file
0b2387a3f67ec050f6d4e08f379e3cbb0a9913f1 341cf8213827614a274c750cd7dec4307eb41de7 CI <CI@example.com> 1617671441 +1000	commit: file changed
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-31 10:53:52 +0000