aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pursehouse <david.pursehouse@gmail.com>2019-06-16 00:27:04 -0400
committerGerrit Code Review @ Eclipse.org <gerrit@eclipse.org>2019-06-16 00:27:04 -0400
commite3bcfe56c7bfab514625a65a6e7ae0d101fd698e (patch)
treecc4aff70d8140089680a98cc251f949b001824f0
parentb20bca8423c39fcdd63ee3a48f4b9160bba84633 (diff)
parent7c98a1aa1bd69414d8279a6bf43042616027226a (diff)
downloadjgit-e3bcfe56c7bfab514625a65a6e7ae0d101fd698e.tar.gz
jgit-e3bcfe56c7bfab514625a65a6e7ae0d101fd698e.zip
Merge "RebaseTodoFileTest: Fix "the the" typo"
-rw-r--r--org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RebaseTodoFileTest.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RebaseTodoFileTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RebaseTodoFileTest.java
index 5cfc75ca93..3d3c697107 100644
--- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RebaseTodoFileTest.java
+++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/lib/RebaseTodoFileTest.java
@@ -68,7 +68,7 @@ public class RebaseTodoFileTest extends RepositoryTestCase {
@Test
public void testReadTodoFile() throws Exception {
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",
"squash " + ObjectId.zeroId().name() + " F",
"fixup " + ObjectId.zeroId().name(),
@@ -93,7 +93,7 @@ public class RebaseTodoFileTest extends RepositoryTestCase {
assertEquals("Expected COMMENT", RebaseTodoLine.Action.COMMENT,
line.getAction());
assertEquals("Unexpected Message",
- "# A comment in the the todo list",
+ "# A comment in the todo list",
line.getComment());
break;
case 2: