RevWalk: fix bad topo flags error message

The error message for an Exception thrown by StartGenerator when given
both the TOPO flag and the TOPO_KEEP_BRANCH_TOGETHER flag mentions a
non-existent flag, TOPO_NON_INTERMIX. The error message was introduced
in commit e498d43.

Replace TOPO_NON_INTERMIX with TOPO_KEEP_BRANCH_TOGETHER in the error
message of an Exception thrown by the StartGenerator when the TOPO flag
is provided together with the TOPO_KEEP_BRANCH_TOGETHER flag.

Signed-off-by: Alex Spradlin <alexaspradlin@google.com>
Change-Id: Id24640dc08e96a196508fe38ce144aa7e035082f

org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevWalkSortTest.java

@@ -310,7 +310,7 @@ public class RevWalkSortTest extends RevWalkTestCase {
 			fail("did not throw IllegalStateException");
 		} catch (IllegalStateException e) {
 			assertEquals(
-					JGitText.get().cannotCombineTopoSortWithTopoNonIntermixSort,
+					JGitText.get().cannotCombineTopoSortWithTopoKeepBranchTogetherSort,
 					e.getMessage());
 		}
 	}

org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties

@@ -54,7 +54,7 @@ cannotChangeActionOnComment=Cannot change action on comment line in git-rebase-t
 cannotCheckoutFromUnbornBranch=Cannot check out from unborn branch
 cannotCheckoutOursSwitchBranch=Checking out ours/theirs is only possible when checking out index, not when switching branches.
 cannotCombineSquashWithNoff=Cannot combine --squash with --no-ff.
-cannotCombineTopoSortWithTopoNonIntermixSort=Cannot combine sorts TOPO and TOPO_NON_INTERMIX.
+cannotCombineTopoSortWithTopoKeepBranchTogetherSort=Cannot combine sorts TOPO and TOPO_KEEP_BRANCH_TOGETHER
 cannotCombineTreeFilterWithRevFilter=Cannot combine TreeFilter {0} with RevFilter {1}.
 cannotCommitOnARepoWithState=Cannot commit on a repo with state: {0}
 cannotCommitWriteTo=Cannot commit write to {0}

org.eclipse.jgit/src/org/eclipse/jgit/internal/JGitText.java

@@ -82,7 +82,7 @@ public class JGitText extends TranslationBundle {
 	/***/ public String cannotCheckoutFromUnbornBranch;
 	/***/ public String cannotCheckoutOursSwitchBranch;
 	/***/ public String cannotCombineSquashWithNoff;
-	/***/ public String cannotCombineTopoSortWithTopoNonIntermixSort;
+	/***/ public String cannotCombineTopoSortWithTopoKeepBranchTogetherSort;
 	/***/ public String cannotCombineTreeFilterWithRevFilter;
 	/***/ public String cannotCommitOnARepoWithState;
 	/***/ public String cannotCommitWriteTo;

org.eclipse.jgit/src/org/eclipse/jgit/revwalk/StartGenerator.java

@@ -137,7 +137,7 @@ class StartGenerator extends Generator {
 		if (walker.hasRevSort(RevSort.TOPO)
 				&& walker.hasRevSort(RevSort.TOPO_KEEP_BRANCH_TOGETHER)) {
 			throw new IllegalStateException(JGitText
-					.get().cannotCombineTopoSortWithTopoNonIntermixSort);
+					.get().cannotCombineTopoSortWithTopoKeepBranchTogetherSort);
 		}
 
 		if (walker.hasRevSort(RevSort.TOPO)