26 lines
759 B
Plaintext
26 lines
759 B
Plaintext
Merge branch 'master' of ../actual_remote
|
|
|
|
# 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/.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
|
|
#
|