diff options
Diffstat (limited to 'test/integration/pullMergeConflict/expected/repo/.git_keep/COMMIT_EDITMSG')
| -rw-r--r-- | test/integration/pullMergeConflict/expected/repo/.git_keep/COMMIT_EDITMSG | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/test/integration/pullMergeConflict/expected/repo/.git_keep/COMMIT_EDITMSG b/test/integration/pullMergeConflict/expected/repo/.git_keep/COMMIT_EDITMSG deleted file mode 100644 index 33d82ab34..000000000 --- a/test/integration/pullMergeConflict/expected/repo/.git_keep/COMMIT_EDITMSG +++ /dev/null @@ -1,25 +0,0 @@ -Merge branch 'master' of ../origin - -# Conflicts: -# myfile4 -# -# It looks like you may be committing a merge. -# If this is not correct, please remove the file -# /Users/jesseduffieldduffield/go/src/github.com/jesseduffield/lazygit/test/integration/pullMergeConflict/actual/repo/.git/MERGE_HEAD -# and try again. - - -# Please enter the commit message for your changes. Lines starting -# with '#' will be ignored, and an empty message aborts the commit. -# -# On branch master -# Your branch and 'origin/master' have diverged, -# and have 1 and 2 different commits each, respectively. -# (use "git pull" to merge the remote branch into yours) -# -# All conflicts fixed but you are still merging. -# -# Changes to be committed: -# new file: myfile3 -# modified: myfile4 -# |