add integration test for merge conflicts resolved externally

test/integration/mergeConflictsResolvedExternally/config/config.yml

@@ -0,0 +1,6 @@
+disableStartupPopups: true
+customCommands:
+  - key: 'N'
+    description: 'Resolve conflict'
+    context: 'files'
+    command: 'echo "master2" > file'

test/integration/mergeConflictsResolvedExternally/expected/.git_keep/COMMIT_EDITMSG

@@ -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
+#

test/integration/mergeConflictsResolvedExternally/expected/.git_keep/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/other

test/integration/mergeConflictsResolvedExternally/expected/.git_keep/ORIG_HEAD

@@ -0,0 +1 @@
+769c8b8d89700f6f196b8331159150746a839662

test/integration/mergeConflictsResolvedExternally/expected/.git_keep/config

@@ -0,0 +1,10 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = false
+	logallrefupdates = true
+	ignorecase = true
+	precomposeunicode = true
+[user]
+	email = CI@example.com
+	name = CI

test/integration/mergeConflictsResolvedExternally/expected/.git_keep/description

@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

test/integration/mergeConflictsResolvedExternally/expected/.git_keep/info/exclude

@@ -0,0 +1,7 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
+.DS_Store

test/integration/mergeConflictsResolvedExternally/expected/.git_keep/logs/HEAD

@@ -0,0 +1,7 @@
+0000000000000000000000000000000000000000 03959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 CI <CI@example.com> 1642403134 +1100	commit (initial): master1
+03959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 03959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 CI <CI@example.com> 1642403134 +1100	checkout: moving from master to other
+03959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 769c8b8d89700f6f196b8331159150746a839662 CI <CI@example.com> 1642403134 +1100	commit: other1
+769c8b8d89700f6f196b8331159150746a839662 03959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 CI <CI@example.com> 1642403134 +1100	checkout: moving from other to master
+03959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 691ee9e9d9c654c81214f56c514ff725f46cb9e4 CI <CI@example.com> 1642403134 +1100	commit: master2
+691ee9e9d9c654c81214f56c514ff725f46cb9e4 769c8b8d89700f6f196b8331159150746a839662 CI <CI@example.com> 1642403134 +1100	checkout: moving from master to other
+769c8b8d89700f6f196b8331159150746a839662 f2df244fb87b6ba1d2ab484d76c66baba168a867 CI <CI@example.com> 1642403138 +1100	commit (merge): Merge branch 'master' into other

test/integration/mergeConflictsResolvedExternally/expected/.git_keep/logs/refs/heads/master

@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 03959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 CI <CI@example.com> 1642403134 +1100	commit (initial): master1
+03959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 691ee9e9d9c654c81214f56c514ff725f46cb9e4 CI <CI@example.com> 1642403134 +1100	commit: master2

test/integration/mergeConflictsResolvedExternally/expected/.git_keep/logs/refs/heads/other

@@ -0,0 +1,3 @@
+0000000000000000000000000000000000000000 03959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 CI <CI@example.com> 1642403134 +1100	branch: Created from HEAD
+03959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 769c8b8d89700f6f196b8331159150746a839662 CI <CI@example.com> 1642403134 +1100	commit: other1
+769c8b8d89700f6f196b8331159150746a839662 f2df244fb87b6ba1d2ab484d76c66baba168a867 CI <CI@example.com> 1642403138 +1100	commit (merge): Merge branch 'master' into other

test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/03/959db9f70fcb4a8f0931e4ad64e1c9ec1016a4

@@ -0,0 +1,4 @@
+x
��A
+1@Q�=E��$��v!"�j���)
+��X���#��<���=����B�ȹą����}TYbQ��8%��H��ϸ��
+.�vӯ�멧��

test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/76/9c8b8d89700f6f196b8331159150746a839662

@@ -0,0 +1,3 @@
+x
��A
+�0@Q�9E���d�1"BW=F�L�`L	<�=���[��j}�B��U��
j
H�Gv�p%�0���=	ƫ�c���@2I^�\���c( ��1{VL�	
}d?ck�΋���C���/��V�=;Bb{F0G=����M�v4?
+�8�

test/integration/mergeConflictsResolvedExternally/expected/.git_keep/refs/heads/master

@@ -0,0 +1 @@
+691ee9e9d9c654c81214f56c514ff725f46cb9e4

test/integration/mergeConflictsResolvedExternally/expected/.git_keep/refs/heads/other

@@ -0,0 +1 @@
+f2df244fb87b6ba1d2ab484d76c66baba168a867

test/integration/mergeConflictsResolvedExternally/expected/file

@@ -0,0 +1 @@
+master2

test/integration/mergeConflictsResolvedExternally/recording.json

@@ -0,0 +1 @@
+{"KeyEvents":[{"Timestamp":438,"Mod":0,"Key":259,"Ch":0},{"Timestamp":663,"Mod":0,"Key":258,"Ch":0},{"Timestamp":1206,"Mod":0,"Key":256,"Ch":77},{"Timestamp":1487,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2045,"Mod":0,"Key":13,"Ch":13},{"Timestamp":2951,"Mod":0,"Key":256,"Ch":78},{"Timestamp":3606,"Mod":0,"Key":13,"Ch":13},{"Timestamp":4343,"Mod":0,"Key":256,"Ch":113}],"ResizeEvents":[{"Timestamp":0,"Width":272,"Height":74}]}

test/integration/mergeConflictsResolvedExternally/setup.sh

@@ -0,0 +1,27 @@
+#!/bin/sh
+
+cd $1
+
+git init
+git config user.email "CI@example.com"
+git config user.name "CI"
+
+git checkout -b master
+
+echo "master1" > file
+git add .
+git commit -m "master1"
+
+git checkout -b other
+
+echo "other1" > file
+git add .
+git commit -m "other1"
+
+git checkout master
+
+echo "master2" > file
+git add .
+git commit -m "master2"
+
+git checkout other

test/integration/mergeConflictsResolvedExternally/test.json

@@ -0,0 +1,4 @@
+{
+  "description": "This test verifies that merge conflicts resolved externally are recognised by lazygit and the user is prompted to continue",
+  "speed": 10
+}