add integration test for merge conflicts resolved externally

2022-01-17 18:29:13 +11:00
parent ee622d044e
commit d3a3c8d87d
29 changed files with 100 additions and 0 deletions
--- a/test/integration/mergeConflictsResolvedExternally/test.json
+++ 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
+}