diff options
Diffstat (limited to 'test/integration/discardFileChanges/expected/.git_keep/COMMIT_EDITMSG')
| -rw-r--r-- | test/integration/discardFileChanges/expected/.git_keep/COMMIT_EDITMSG | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/test/integration/discardFileChanges/expected/.git_keep/COMMIT_EDITMSG b/test/integration/discardFileChanges/expected/.git_keep/COMMIT_EDITMSG index 2bdf67abb..552587d35 100644 --- a/test/integration/discardFileChanges/expected/.git_keep/COMMIT_EDITMSG +++ b/test/integration/discardFileChanges/expected/.git_keep/COMMIT_EDITMSG @@ -1 +1,23 @@ -three +Merge branch 'conflict' into conflict_second + +# Conflicts: +# added-them-changed-us.txt +# both-added.txt +# both-deleted.txt +# both-modded.txt +# changed-them-added-us.txt +# deleted-them.txt +# deleted-us.txt +# +# 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/discardFileChanges/actual/.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 conflict_second +# All conflicts fixed but you are still merging. +# |