diff options
Diffstat (limited to 'test/integration/pullMergeConflict/expected/repo/.git_keep/logs/HEAD')
| -rw-r--r-- | test/integration/pullMergeConflict/expected/repo/.git_keep/logs/HEAD | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/HEAD b/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/HEAD deleted file mode 100644 index d67e84881..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/logs/HEAD +++ /dev/null @@ -1,7 +0,0 @@ -0000000000000000000000000000000000000000 7c201cb45dc62900f5f42281c1235219df5d0388 CI <CI@example.com> 1648349178 +1100 commit (initial): myfile1 -7c201cb45dc62900f5f42281c1235219df5d0388 77a75278eb08101403d727a8ecaad724f5d9dc78 CI <CI@example.com> 1648349178 +1100 commit: myfile2 -77a75278eb08101403d727a8ecaad724f5d9dc78 c7180f424ee6b59241eecffedcfa4472a86d927d CI <CI@example.com> 1648349178 +1100 commit: myfile3 -c7180f424ee6b59241eecffedcfa4472a86d927d 29c0636a86cc64292b7a6b1083c2df10de9cde6c CI <CI@example.com> 1648349178 +1100 commit: myfile4 -29c0636a86cc64292b7a6b1083c2df10de9cde6c 77a75278eb08101403d727a8ecaad724f5d9dc78 CI <CI@example.com> 1648349178 +1100 reset: moving to HEAD~2 -77a75278eb08101403d727a8ecaad724f5d9dc78 4db288af7bc797a3819441c734a4c4e7e3635296 CI <CI@example.com> 1648349178 +1100 commit: myfile4 conflict -4db288af7bc797a3819441c734a4c4e7e3635296 c25833e74799f64c317fe3f112f934fcc57b71f9 CI <CI@example.com> 1648349183 +1100 commit (merge): Merge branch 'master' of ../origin |