Show original todo action instead of "conflict", and show <-- CONFLICT instead

It is useful to see if the conflicted commit was a "pick" or an "edit". What's
more, we're about to add support for showing cherry-picks and reverts, and
seeing that a conflicted commit was a revert is important because its diff is
backwards compared to the diff of the conflicting files in the Files panel.

pkg/integration/tests/commit/amend_when_there_are_conflicts_and_amend.go

@@ -30,7 +30,7 @@ var AmendWhenThereAreConflictsAndAmend = NewIntegrationTest(NewIntegrationTestAr
 			Focus().
 			Lines(
 				Contains("pick").Contains("commit three"),
-				Contains("conflict").Contains("<-- YOU ARE HERE --- file1 changed in branch"),
+				Contains("pick").Contains("<-- CONFLICT --- file1 changed in branch"),
 				Contains("commit two"),
 				Contains("file1 changed in master"),
 				Contains("base commit"),

pkg/integration/tests/commit/amend_when_there_are_conflicts_and_cancel.go

@@ -34,7 +34,7 @@ var AmendWhenThereAreConflictsAndCancel = NewIntegrationTest(NewIntegrationTestA
 			Focus().
 			Lines(
 				Contains("pick").Contains("commit three"),
-				Contains("conflict").Contains("<-- YOU ARE HERE --- file1 changed in branch"),
+				Contains("pick").Contains("<-- CONFLICT --- file1 changed in branch"),
 				Contains("commit two"),
 				Contains("file1 changed in master"),
 				Contains("base commit"),

pkg/integration/tests/commit/shared.go

@@ -44,7 +44,7 @@ func doTheRebaseForAmendTests(t *TestDriver, keys config.KeybindingConfig) {
 	t.Views().Commits().
 		Lines(
 			Contains("pick").Contains("commit three"),
-			Contains("conflict").Contains("<-- YOU ARE HERE --- file1 changed in branch"),
+			Contains("pick").Contains("<-- CONFLICT --- file1 changed in branch"),
 			Contains("commit two"),
 			Contains("file1 changed in master"),
 			Contains("base commit"),