Browse Source

Merge "RebaseTodoFileTest: Fix "the the" typo"

stable-5.5
David Pursehouse 6 years ago committed by Gerrit Code Review @ Eclipse.org
parent
commit
e3bcfe56c7
  1. 4
      org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RebaseTodoFileTest.java

4
org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RebaseTodoFileTest.java

@ -68,7 +68,7 @@ public class RebaseTodoFileTest extends RepositoryTestCase {
@Test @Test
public void testReadTodoFile() throws Exception { public void testReadTodoFile() throws Exception {
String[] expected = { "reword " + ObjectId.zeroId().name() + " Foo", String[] expected = { "reword " + ObjectId.zeroId().name() + " Foo",
"# A comment in the the todo list", "# A comment in the todo list",
"pick " + ObjectId.zeroId().name() + " Foo fie", "pick " + ObjectId.zeroId().name() + " Foo fie",
"squash " + ObjectId.zeroId().name() + " F", "squash " + ObjectId.zeroId().name() + " F",
"fixup " + ObjectId.zeroId().name(), "fixup " + ObjectId.zeroId().name(),
@ -93,7 +93,7 @@ public class RebaseTodoFileTest extends RepositoryTestCase {
assertEquals("Expected COMMENT", RebaseTodoLine.Action.COMMENT, assertEquals("Expected COMMENT", RebaseTodoLine.Action.COMMENT,
line.getAction()); line.getAction());
assertEquals("Unexpected Message", assertEquals("Unexpected Message",
"# A comment in the the todo list", "# A comment in the todo list",
line.getComment()); line.getComment());
break; break;
case 2: case 2:

Loading…
Cancel
Save