add tests for dealing with remotes

This commit is contained in:
Jesse Duffield
2021-10-22 20:18:40 +11:00
parent 6388af70ac
commit 2008c39516
663 changed files with 1663 additions and 72 deletions

View File

@@ -0,0 +1,16 @@
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 4589efc
# Last command done (1 command done):
# pick 9013b5f myfile4 conflict
# Next commands to do (3 remaining commands):
# pick 0fa5386 5
# drop 69a5c9f 6
# You are currently rebasing branch 'master' on '4589efc'.
#
# Changes to be committed:
# modified: myfile4
#