diff options
Diffstat (limited to 'test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/other_branch')
| -rw-r--r-- | test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/other_branch | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/other_branch b/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/other_branch deleted file mode 100644 index 5842c42d8..000000000 --- a/test/integration/mergeConflictsFiltered/expected/repo/.git_keep/logs/refs/heads/other_branch +++ /dev/null @@ -1,2 +0,0 @@ -0000000000000000000000000000000000000000 c62b5bc94e327ddb9b545213ff77b207ade48aba CI <CI@example.com> 1643618835 +1100 branch: Created from HEAD -c62b5bc94e327ddb9b545213ff77b207ade48aba d7d52ecd690fe82c7d820ddb437e82d78b0fa7b2 CI <CI@example.com> 1643618855 +1100 commit (merge): Merge branch 'develop' into other_branch |