Add test for reverting a commit that conflicts

This works already (except that the "you are here" marker is not right yet, but
that's an issue for another PR), just add a test that verifies it.

pkg/integration/tests/test_list.go

@@ -128,6 +128,7 @@ var tests = []*components.IntegrationTest{
 	commit.ResetAuthorRange,
 	commit.Revert,
 	commit.RevertMerge,
+	commit.RevertWithConflictSingleCommit,
 	commit.Reword,
 	commit.Search,
 	commit.SetAuthor,