fixup! Add merge options menu

Author: stefanhaller

pkg/integration/tests/conflicts/merge_file_theirs.go

@@ -6,37 +6,43 @@ import (
 )
 
 var OriginalFileContent = `
-This Is The
-Original
-File
-..
+1
+2
+3
+4
+5
+6
 `
 
 var FirstChangeFileContent = `
-This Is The
-First Change
-File
-..
-This Change Is Only In The First File
+1
+2
+3
+4
+5a
+6
 `
 
 var SecondChangeFileContent = `
-This Is The
-Second Change
-File
-..
+1b
+2
+3
+4
+5b
+6
 `
 
 var MergeSecondFileFinalContent = `
-This Is The
-Second Change
-File
-..
-This Change Is Only In The First File
+1b
+2
+3
+4
+5a
+6
 `
 
 var MergeFileTheirs = NewIntegrationTest(NewIntegrationTestArgs{
-	Description:  "Conflicting file can be resolved to 'their' version via merge-file",
+	Description:  "Conflicting file can be resolved to 'our' version via merge-file",
 	ExtraCmdArgs: []string{},
 	Skip:         false,
 	SetupConfig:  func(config *config.AppConfig) {},
@@ -67,7 +73,7 @@ var MergeFileTheirs = NewIntegrationTest(NewIntegrationTestArgs{
 
 		t.ExpectPopup().Menu().
 			Title(Equals("Resolve merge conflicts")).
-			Select(Contains("Use Incoming")). // merge-file --theirs
+			Select(Contains("Use HEAD")). // merge-file --theirs
 			Confirm()
 
 		t.Common().ContinueOnConflictsResolved("merge")