From d3a3c8d87d5a25fe30ea5da76c572fad895bdfdb Mon Sep 17 00:00:00 2001
From: Jesse Duffield <jessedduffield@gmail.com>
Date: Mon, 17 Jan 2022 18:29:13 +1100
Subject: [PATCH] add integration test for merge conflicts resolved externally

---
 .../config/config.yml                         |   6 ++++
 .../expected/.git_keep/COMMIT_EDITMSG         |  20 +++++++++++++
 .../expected/.git_keep/FETCH_HEAD             |   0
 .../expected/.git_keep/HEAD                   |   1 +
 .../expected/.git_keep/ORIG_HEAD              |   1 +
 .../expected/.git_keep/config                 |  10 +++++++
 .../expected/.git_keep/description            |   1 +
 .../expected/.git_keep/index                  | Bin 0 -> 231 bytes
 .../expected/.git_keep/info/exclude           |   7 +++++
 .../expected/.git_keep/logs/HEAD              |   7 +++++
 .../expected/.git_keep/logs/refs/heads/master |   2 ++
 .../expected/.git_keep/logs/refs/heads/other  |   3 ++
 .../03/959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 |   4 +++
 .../08/84a47e04257f4c85435a8b10ff4f15fffa63fc | Bin 0 -> 23 bytes
 .../0b/e6e80a67f6276c5ede28dd6b8fa8873f1b23c5 | Bin 0 -> 22 bytes
 .../2d/8021ed8803ed6142d31b331850ef46246391a7 | Bin 0 -> 49 bytes
 .../53/502c7023f80c046a1b00b45614d5ffef8977d9 | Bin 0 -> 48 bytes
 .../69/1ee9e9d9c654c81214f56c514ff725f46cb9e4 | Bin 0 -> 148 bytes
 .../6b/03bc7537ecf00b48a0ea57ce1edf388ed3f1ad | Bin 0 -> 49 bytes
 .../76/9c8b8d89700f6f196b8331159150746a839662 |   3 ++
 .../bd/2b32f02abf86a2bb79a12ab09758e44b204b34 | Bin 0 -> 23 bytes
 .../c0/565d7cfcf1039c969105f2e1c86ca5eff64381 | Bin 0 -> 49 bytes
 .../f2/df244fb87b6ba1d2ab484d76c66baba168a867 | Bin 0 -> 197 bytes
 .../expected/.git_keep/refs/heads/master      |   1 +
 .../expected/.git_keep/refs/heads/other       |   1 +
 .../expected/file                             |   1 +
 .../recording.json                            |   1 +
 .../mergeConflictsResolvedExternally/setup.sh |  27 ++++++++++++++++++
 .../test.json                                 |   4 +++
 29 files changed, 100 insertions(+)
 create mode 100644 test/integration/mergeConflictsResolvedExternally/config/config.yml
 create mode 100644 test/integration/mergeConflictsResolvedExternally/expected/.git_keep/COMMIT_EDITMSG
 create mode 100644 test/integration/mergeConflictsResolvedExternally/expected/.git_keep/FETCH_HEAD
 create mode 100644 test/integration/mergeConflictsResolvedExternally/expected/.git_keep/HEAD
 create mode 100644 test/integration/mergeConflictsResolvedExternally/expected/.git_keep/ORIG_HEAD
 create mode 100644 test/integration/mergeConflictsResolvedExternally/expected/.git_keep/config
 create mode 100644 test/integration/mergeConflictsResolvedExternally/expected/.git_keep/description
 create mode 100644 test/integration/mergeConflictsResolvedExternally/expected/.git_keep/index
 create mode 100644 test/integration/mergeConflictsResolvedExternally/expected/.git_keep/info/exclude
 create mode 100644 test/integration/mergeConflictsResolvedExternally/expected/.git_keep/logs/HEAD
 create mode 100644 test/integration/mergeConflictsResolvedExternally/expected/.git_keep/logs/refs/heads/master
 create mode 100644 test/integration/mergeConflictsResolvedExternally/expected/.git_keep/logs/refs/heads/other
 create mode 100644 test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/03/959db9f70fcb4a8f0931e4ad64e1c9ec1016a4
 create mode 100644 test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/08/84a47e04257f4c85435a8b10ff4f15fffa63fc
 create mode 100644 test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/0b/e6e80a67f6276c5ede28dd6b8fa8873f1b23c5
 create mode 100644 test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/2d/8021ed8803ed6142d31b331850ef46246391a7
 create mode 100644 test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/53/502c7023f80c046a1b00b45614d5ffef8977d9
 create mode 100644 test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/69/1ee9e9d9c654c81214f56c514ff725f46cb9e4
 create mode 100644 test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/6b/03bc7537ecf00b48a0ea57ce1edf388ed3f1ad
 create mode 100644 test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/76/9c8b8d89700f6f196b8331159150746a839662
 create mode 100644 test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/bd/2b32f02abf86a2bb79a12ab09758e44b204b34
 create mode 100644 test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/c0/565d7cfcf1039c969105f2e1c86ca5eff64381
 create mode 100644 test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/f2/df244fb87b6ba1d2ab484d76c66baba168a867
 create mode 100644 test/integration/mergeConflictsResolvedExternally/expected/.git_keep/refs/heads/master
 create mode 100644 test/integration/mergeConflictsResolvedExternally/expected/.git_keep/refs/heads/other
 create mode 100644 test/integration/mergeConflictsResolvedExternally/expected/file
 create mode 100644 test/integration/mergeConflictsResolvedExternally/recording.json
 create mode 100644 test/integration/mergeConflictsResolvedExternally/setup.sh
 create mode 100644 test/integration/mergeConflictsResolvedExternally/test.json

diff --git a/test/integration/mergeConflictsResolvedExternally/config/config.yml b/test/integration/mergeConflictsResolvedExternally/config/config.yml
new file mode 100644
index 000000000..33b63939a
--- /dev/null
+++ b/test/integration/mergeConflictsResolvedExternally/config/config.yml
@@ -0,0 +1,6 @@
+disableStartupPopups: true
+customCommands:
+  - key: 'N'
+    description: 'Resolve conflict'
+    context: 'files'
+    command: 'echo "master2" > file'
diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/COMMIT_EDITMSG b/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/COMMIT_EDITMSG
new file mode 100644
index 000000000..9c1b1e853
--- /dev/null
+++ b/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
+#
diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/FETCH_HEAD b/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/FETCH_HEAD
new file mode 100644
index 000000000..e69de29bb
diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/HEAD b/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/HEAD
new file mode 100644
index 000000000..0ca960536
--- /dev/null
+++ b/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/other
diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/ORIG_HEAD b/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/ORIG_HEAD
new file mode 100644
index 000000000..30d51fe1d
--- /dev/null
+++ b/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/ORIG_HEAD
@@ -0,0 +1 @@
+769c8b8d89700f6f196b8331159150746a839662
diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/config b/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/config
new file mode 100644
index 000000000..8ae104545
--- /dev/null
+++ b/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
diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/description b/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/description
new file mode 100644
index 000000000..498b267a8
--- /dev/null
+++ b/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/description
@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.
diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/index b/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/index
new file mode 100644
index 0000000000000000000000000000000000000000..61de7270ad4b71a053e71a85280edd268c0bd331
GIT binary patch
literal 231
zcmZ?q402{*U|<4b#>A(RkBqPTr^0AP1_o9pzBO7542?^G(qDmUM1Yusqh(1Qi)y`3
zt8-Mhz<+<y|G$#|FtDU$=A;5;fgmKv)fGrdG8ifta0LhG6e$1TVabwa*b*jk_5b_M
z@|!`fp&(1cz*-Cq49rYS7*MIb+D0F=_O~tCUAa(e!}N$J-U{9(+|OQcrGHb;iMyw9
lH@kmDyS=pXQEX1}n7VRLow?`Dj$9@010E+6cP<J14FIe^PO1O^

literal 0
HcmV?d00001

diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/info/exclude b/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/info/exclude
new file mode 100644
index 000000000..8e9f2071f
--- /dev/null
+++ b/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
diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/logs/HEAD b/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/logs/HEAD
new file mode 100644
index 000000000..e316f4ff1
--- /dev/null
+++ b/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
diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/logs/refs/heads/master b/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/logs/refs/heads/master
new file mode 100644
index 000000000..2e39e4fcd
--- /dev/null
+++ b/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
diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/logs/refs/heads/other b/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/logs/refs/heads/other
new file mode 100644
index 000000000..a462e4b21
--- /dev/null
+++ b/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
diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/03/959db9f70fcb4a8f0931e4ad64e1c9ec1016a4 b/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/03/959db9f70fcb4a8f0931e4ad64e1c9ec1016a4
new file mode 100644
index 000000000..e91b55a9f
--- /dev/null
+++ b/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ӯ�멧��
+��#{8!�Y�d�ܙ�'&�xR-k
\ No newline at end of file
diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/08/84a47e04257f4c85435a8b10ff4f15fffa63fc b/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/08/84a47e04257f4c85435a8b10ff4f15fffa63fc
new file mode 100644
index 0000000000000000000000000000000000000000..20a13c21890e7e375d02d129591c6cdbd1cf6d7c
GIT binary patch
literal 23
fcmb<m^geacKWIb3311yOPhF!&ObqIGSq=aIZiWcV

literal 0
HcmV?d00001

diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/0b/e6e80a67f6276c5ede28dd6b8fa8873f1b23c5 b/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/0b/e6e80a67f6276c5ede28dd6b8fa8873f1b23c5
new file mode 100644
index 0000000000000000000000000000000000000000..eb74d7a8840a73307f34dbacaa7840766eb60e10
GIT binary patch
literal 22
dcmb<m^geacKgb~cg#JknU85&V3`+A@LI7k!2lW5|

literal 0
HcmV?d00001

diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/2d/8021ed8803ed6142d31b331850ef46246391a7 b/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/2d/8021ed8803ed6142d31b331850ef46246391a7
new file mode 100644
index 0000000000000000000000000000000000000000..660150da8275dc686e89731eebaacc20375f7ba0
GIT binary patch
literal 49
zcmV-10M7q-0V^p=O;s>9VlXr?Ff%bxNXyJgW#E4Hf-C)-dQRLujl0?XE86X)m5%}d
H28Ir#)Hf9y

literal 0
HcmV?d00001

diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/53/502c7023f80c046a1b00b45614d5ffef8977d9 b/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/53/502c7023f80c046a1b00b45614d5ffef8977d9
new file mode 100644
index 0000000000000000000000000000000000000000..fdb7cf9f9ce99114b878604e39115fc817d5fe6b
GIT binary patch
literal 48
zcmV-00MGw;0V^p=O;s>9VlXr?Ff%bxNXyJgW#DL8QpciN@6+lW)h+PfU-bX4<UauK
G8xB9emK9O}

literal 0
HcmV?d00001

diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/69/1ee9e9d9c654c81214f56c514ff725f46cb9e4 b/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/69/1ee9e9d9c654c81214f56c514ff725f46cb9e4
new file mode 100644
index 0000000000000000000000000000000000000000..ebc29f7ce36b7d9db8726108d742433171f3a4fa
GIT binary patch
literal 148
zcmV;F0Biqv0gcW<3c@fDKvCB@MfQTsB$K2AB7&<PW0FizFt*eP9^W3p?dL6iS$cmA
zi%f^HsoLNJxRSv6HbDW3f*BxFh)6ZGrfuSsDw|a{eGLnq1J}$gK`WVLYQP?qq()LK
ztOWt1kde>0FPpv1_I#VK`jx&u^;DLAu^7n_c=TkChyZ4<`_#}sx#{xWu`@q=@;S;}
CIY(#!

literal 0
HcmV?d00001

diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/6b/03bc7537ecf00b48a0ea57ce1edf388ed3f1ad b/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/6b/03bc7537ecf00b48a0ea57ce1edf388ed3f1ad
new file mode 100644
index 0000000000000000000000000000000000000000..9ccb24501a89e37bf43dafc7f94dff30f515cc4c
GIT binary patch
literal 49
zcmV-10M7q-0V^p=O;s>9VlXr?Ff%bxNXyJgW!S52^g(NX+oIi-3$->(k9gv(;B5i`
H3b78X#1a%D

literal 0
HcmV?d00001

diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/76/9c8b8d89700f6f196b8331159150746a839662 b/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/76/9c8b8d89700f6f196b8331159150746a839662
new file mode 100644
index 000000000..f6c47ec28
--- /dev/null
+++ b/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�
\ No newline at end of file
diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/bd/2b32f02abf86a2bb79a12ab09758e44b204b34 b/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/bd/2b32f02abf86a2bb79a12ab09758e44b204b34
new file mode 100644
index 0000000000000000000000000000000000000000..abea138422cb0a69f1ff4af68cadaed74809aed4
GIT binary patch
literal 23
fcmb<m^geacKWIb3311yOPhF!YObqI`S@r_}ZjA`b

literal 0
HcmV?d00001

diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/c0/565d7cfcf1039c969105f2e1c86ca5eff64381 b/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/c0/565d7cfcf1039c969105f2e1c86ca5eff64381
new file mode 100644
index 0000000000000000000000000000000000000000..7d88244be21c3c0dec5a2db71410d7251295afd1
GIT binary patch
literal 49
zcmb<m^geacKghr|WkVwaD}T7V__{xndafur>qT=sIOVIO=c#M-Xj3x-E603ph8w2^
FJOIrF5)c3Y

literal 0
HcmV?d00001

diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/f2/df244fb87b6ba1d2ab484d76c66baba168a867 b/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/objects/f2/df244fb87b6ba1d2ab484d76c66baba168a867
new file mode 100644
index 0000000000000000000000000000000000000000..a8bc1219e26505808f5dd7ba3901e000411db4d3
GIT binary patch
literal 197
zcmV;$06PD80gaElY6CG4MN{urOy?pHX7m_oAOwRe7x@TDJIWfYT_Y=y&ySk)sV*GO
zDQ-DhyA3cLUPf01Z#|k4(AXNWpyNatF+0!XR$r^uC?Tw}JW|(vKwv2`$8}P~%9Vt3
zw3f&Vc?`3UR+!D7&qAuAvPxm^N+d(BdM<uW4aQf;C5yTxeUI(vaJj<!<$Bhi)E;+z
zD@XePVrLv$vJqa15SK~kiJ|}0mrw0q3c07fY;bDnInxu|_Hn>5HtowV_ij$IGbLQE

literal 0
HcmV?d00001

diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/refs/heads/master b/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/refs/heads/master
new file mode 100644
index 000000000..b735e793a
--- /dev/null
+++ b/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/refs/heads/master
@@ -0,0 +1 @@
+691ee9e9d9c654c81214f56c514ff725f46cb9e4
diff --git a/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/refs/heads/other b/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/refs/heads/other
new file mode 100644
index 000000000..52ac4afa8
--- /dev/null
+++ b/test/integration/mergeConflictsResolvedExternally/expected/.git_keep/refs/heads/other
@@ -0,0 +1 @@
+f2df244fb87b6ba1d2ab484d76c66baba168a867
diff --git a/test/integration/mergeConflictsResolvedExternally/expected/file b/test/integration/mergeConflictsResolvedExternally/expected/file
new file mode 100644
index 000000000..0884a47e0
--- /dev/null
+++ b/test/integration/mergeConflictsResolvedExternally/expected/file
@@ -0,0 +1 @@
+master2
diff --git a/test/integration/mergeConflictsResolvedExternally/recording.json b/test/integration/mergeConflictsResolvedExternally/recording.json
new file mode 100644
index 000000000..21b60ce5a
--- /dev/null
+++ b/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}]}
\ No newline at end of file
diff --git a/test/integration/mergeConflictsResolvedExternally/setup.sh b/test/integration/mergeConflictsResolvedExternally/setup.sh
new file mode 100644
index 000000000..1e6ecd751
--- /dev/null
+++ b/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
diff --git a/test/integration/mergeConflictsResolvedExternally/test.json b/test/integration/mergeConflictsResolvedExternally/test.json
new file mode 100644
index 000000000..e51abcada
--- /dev/null
+++ b/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
+}