mirror of
https://github.com/jesseduffield/lazygit.git
synced 2026-09-27 17:56:37 -04:00
17 lines
473 B
Plaintext
17 lines
473 B
Plaintext
myfile4 conflict
|
|
|
|
# Please enter the commit message for your changes. Lines starting
|
|
# with '#' will be ignored, and an empty message aborts the commit.
|
|
#
|
|
# interactive rebase in progress; onto d43a810
|
|
# Last command done (1 command done):
|
|
# pick e974f4a myfile4 conflict
|
|
# Next commands to do (3 remaining commands):
|
|
# pick d217625 5
|
|
# pick 09f87d1 6
|
|
# You are currently rebasing branch 'master' on 'd43a810'.
|
|
#
|
|
# Changes to be committed:
|
|
# modified: myfile4
|
|
#
|