ComputerSurge/lazygit
3
0
Fork 0
Code Pull Requests 1 Activity

refactor integration tests

Browse Source
This commit is contained in:
Jesse Duffield
2022-03-27 11:47:07 +11:00
parent 2b3d457aa4
commit 20ec6d98ad
3991 changed files with 1205 additions and 968 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
test/integration/mergeConflictsResolvedExternally/expected/repo/.git_keep/COMMIT_EDITMSG Normal file
View File

@@ -0,0 +1,20 @@
Merge branch 'master' into other
# Conflicts:
# file
#
# 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/mergeConflictsResolvedExternally/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 other
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
# modified: file
#