Fix broken MergeCommandTest
Test was broken by commit b087bba3 changing formatting of merge
commit messages.
Change-Id: I98b1b936b9b6cbaa50fbc59d243a43e66a6ee9f9
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java
index dbf3ba0..231b009 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java
@@ -247,7 +247,7 @@ public void testSuccessfulContentMerge() throws Exception {
assertEquals(thirdCommit, newHead.getParent(0));
assertEquals(secondCommit, newHead.getParent(1));
assertEquals(
- "merging 3fa334456d236a92db020289fe0bf481d91777b4 into HEAD",
+ "Merge commit '3fa334456d236a92db020289fe0bf481d91777b4' into HEAD",
newHead.getFullMessage());
// @TODO fix me
assertEquals(RepositoryState.SAFE, db.getRepositoryState());
@@ -307,7 +307,7 @@ public void testSuccessfulContentMergeAndDirtyworkingTree()
assertEquals(thirdCommit, newHead.getParent(0));
assertEquals(secondCommit, newHead.getParent(1));
assertEquals(
- "merging 064d54d98a4cdb0fed1802a21c656bfda67fe879 into HEAD",
+ "Merge commit '064d54d98a4cdb0fed1802a21c656bfda67fe879' into HEAD",
newHead.getFullMessage());
assertEquals(RepositoryState.SAFE, db.getRepositoryState());
