diff options
| author | Shawn Pearce <spearce@spearce.org> | 2010-11-09 18:58:34 -0500 |
|---|---|---|
| committer | Code Review <codereview-daemon@eclipse.org> | 2010-11-09 18:58:34 -0500 |
| commit | 17b1003ff221a7ab7d8ef749e15e1a753efd6109 (patch) | |
| tree | 49ccfb99f42d6f76ebce4290c8f9539e1e2c2d5b /org.eclipse.jgit.test/tst/org/eclipse | |
| parent | ab7d08ec9689b54c02fd5865529ef2437dcf379b (diff) | |
| parent | 2cba7b35220cb27aa06de3b0669b79bdd494f7c0 (diff) | |
| download | jgit-17b1003ff221a7ab7d8ef749e15e1a753efd6109.tar.gz jgit-17b1003ff221a7ab7d8ef749e15e1a753efd6109.zip | |
Merge "Fix broken MergeCommandTest"
Diffstat (limited to 'org.eclipse.jgit.test/tst/org/eclipse')
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/api/MergeCommandTest.java | 4 |
1 files changed, 2 insertions, 2 deletions
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 dbf3ba015e..231b009764 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 class MergeCommandTest extends RepositoryTestCase { 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 class MergeCommandTest extends RepositoryTestCase { 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()); |