diff options
Diffstat (limited to 'test/integration/rebase2/expected/repo/.git_keep/MERGE_MSG')
| -rw-r--r-- | test/integration/rebase2/expected/repo/.git_keep/MERGE_MSG | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/test/integration/rebase2/expected/repo/.git_keep/MERGE_MSG b/test/integration/rebase2/expected/repo/.git_keep/MERGE_MSG deleted file mode 100644 index ebd2bf400..000000000 --- a/test/integration/rebase2/expected/repo/.git_keep/MERGE_MSG +++ /dev/null @@ -1,4 +0,0 @@ -file4-changed - -# Conflicts: -# file4 |