summaryrefslogtreecommitdiffstats
path: root/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/base_branch
diff options
context:
space:
mode:
Diffstat (limited to 'test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/base_branch')
-rw-r--r--test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/base_branch3
1 files changed, 0 insertions, 3 deletions
diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/base_branch b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/base_branch
deleted file mode 100644
index 9b14238c0..000000000
--- a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/base_branch
+++ /dev/null
@@ -1,3 +0,0 @@
-0000000000000000000000000000000000000000 d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 CI <CI@example.com> 1643618835 +1100 branch: Created from HEAD
-d4f8ef9f7c7602e92d2b2c7228bdaf3c7314d802 c62b5bc94e327ddb9b545213ff77b207ade48aba CI <CI@example.com> 1643618835 +1100 commit: file
-c62b5bc94e327ddb9b545213ff77b207ade48aba a51a44d96e13555215619b32065d0a22d95b8476 CI <CI@example.com> 1643618835 +1100 commit: file changed