summaryrefslogtreecommitdiffstats
path: root/test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/feature/cherry-picking
diff options
context:
space:
mode:
Diffstat (limited to 'test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/feature/cherry-picking')
-rw-r--r--test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/feature/cherry-picking9
1 files changed, 0 insertions, 9 deletions
diff --git a/test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/feature/cherry-picking b/test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/feature/cherry-picking
deleted file mode 100644
index f90ef71fb..000000000
--- a/test/integration/mergeConflicts/expected/repo/.git_keep/logs/refs/heads/feature/cherry-picking
+++ /dev/null
@@ -1,9 +0,0 @@
-0000000000000000000000000000000000000000 1618ce1085acb41fd710e279ac38911aadfb0a09 CI <CI@example.com> 1617671441 +1000 branch: Created from HEAD
-1618ce1085acb41fd710e279ac38911aadfb0a09 b2d5312a06a9c56e9ada21c48a12f57ce8dd4c4a CI <CI@example.com> 1617671441 +1000 commit: first commit freshman year
-b2d5312a06a9c56e9ada21c48a12f57ce8dd4c4a f7f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e CI <CI@example.com> 1617671441 +1000 commit: second commit subway eat fresh
-f7f30ea7f84d4521d3ce9cc08b780c7a1bf7cc5e edd4e2e50eb82125428b045c540a9194d934e180 CI <CI@example.com> 1617671441 +1000 commit: third commit fresh
-edd4e2e50eb82125428b045c540a9194d934e180 cc19bee93215b6c20ab129fb2c006762d4ae1497 CI <CI@example.com> 1617671441 +1000 commit: fourth commit cool
-cc19bee93215b6c20ab129fb2c006762d4ae1497 b0753bdba91b84e3f406e21dbc7deba8e98f1fc8 CI <CI@example.com> 1617671441 +1000 commit: fifth commit nice
-b0753bdba91b84e3f406e21dbc7deba8e98f1fc8 df2c0daa40dcba0dded361a25ff7806b13db59a6 CI <CI@example.com> 1617671441 +1000 commit: sixth commit haha
-df2c0daa40dcba0dded361a25ff7806b13db59a6 1fbc3eb4b11cb89b204a593572c2e01462ca5a89 CI <CI@example.com> 1617671441 +1000 commit: seventh commit yeah
-1fbc3eb4b11cb89b204a593572c2e01462ca5a89 d3e2708327280097b5e1f8ab69309934b24f8b64 CI <CI@example.com> 1617671441 +1000 commit: eighth commit woo