diff options
| author | Chris Aniszczyk <caniszczyk@gmail.com> | 2011-02-02 10:18:31 -0500 |
|---|---|---|
| committer | Code Review <codereview-daemon@eclipse.org> | 2011-02-02 10:18:31 -0500 |
| commit | 80362df5aa5333a0c891c8970b296a689b654c9b (patch) | |
| tree | c8380e92d0881857173ae323e7014d6c00a01c32 | |
| parent | 29ed09a44fc1e32e9adb5a9e3acbbac044c0fb42 (diff) | |
| parent | 8a635668ecf0a3db38196a72b5f0bb8f6bef685e (diff) | |
| download | jgit-80362df5aa5333a0c891c8970b296a689b654c9b.tar.gz jgit-80362df5aa5333a0c891c8970b296a689b654c9b.zip | |
Merge "Adapt expected commit message in tests"
| -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 a35396cc9f..0ef24bd8a5 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 @@ -364,7 +364,7 @@ public class MergeCommandTest extends RepositoryTestCase { assertEquals(thirdCommit, newHead.getParent(0)); assertEquals(secondCommit, newHead.getParent(1)); assertEquals( - "Merge commit '3fa334456d236a92db020289fe0bf481d91777b4' into HEAD", + "Merge commit '3fa334456d236a92db020289fe0bf481d91777b4'", newHead.getFullMessage()); // @TODO fix me assertEquals(RepositoryState.SAFE, db.getRepositoryState()); @@ -425,7 +425,7 @@ public class MergeCommandTest extends RepositoryTestCase { assertEquals(thirdCommit, newHead.getParent(0)); assertEquals(secondCommit, newHead.getParent(1)); assertEquals( - "Merge commit '064d54d98a4cdb0fed1802a21c656bfda67fe879' into HEAD", + "Merge commit '064d54d98a4cdb0fed1802a21c656bfda67fe879'", newHead.getFullMessage()); assertEquals(RepositoryState.SAFE, db.getRepositoryState()); |