summaryrefslogtreecommitdiffstats
path: root/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/master
diff options
context:
space:
mode:
Diffstat (limited to 'test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/master')
-rw-r--r--test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/master5
1 files changed, 0 insertions, 5 deletions
diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/master b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/master
deleted file mode 100644
index d27b9c51b..000000000
--- a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/master
+++ /dev/null
@@ -1,5 +0,0 @@
-0000000000000000000000000000000000000000 f37ec566036d715d6995f55dbc82a4fb3cf56f2f CI <CI@example.com> 1643618835 +1100 commit (initial): first commit
-f37ec566036d715d6995f55dbc82a4fb3cf56f2f abdaa06b758aa198cc4afb9c406c87c5690d0ca0 CI <CI@example.com> 1643618835 +1100 commit: first commit on master
-abdaa06b758aa198cc4afb9c406c87c5690d0ca0 dd401e3ee3d58b648207cee7f737364a37139bea CI <CI@example.com> 1643618835 +1100 commit: second commit on master
-dd401e3ee3d58b648207cee7f737364a37139bea 34d20faa891d1857610dce8f790a35b702ebd7ee CI <CI@example.com> 1643618835 +1100 commit: third commit on master
-34d20faa891d1857610dce8f790a35b702ebd7ee d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 CI <CI@example.com> 1643618835 +1100 commit: fourth commit on master