diff options
| author | Christian Halstrick <christian.halstrick@sap.com> | 2012-09-25 16:41:56 -0400 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2012-09-25 16:41:56 -0400 |
| commit | 01a33350eef2f83f75f23485aa179314e278ebca (patch) | |
| tree | 44552b4e06f39067b4fa39bc1e4eab5ce05c18d4 /org.eclipse.jgit.test/tst | |
| parent | bc66934a8317f4af1e8454560f8179a249026dcc (diff) | |
| parent | 2531d939e42f706cb061c7bc0a0fd1c7574958c2 (diff) | |
| download | jgit-01a33350eef2f83f75f23485aa179314e278ebca.tar.gz jgit-01a33350eef2f83f75f23485aa179314e278ebca.zip | |
Merge "Add the intended file to avoid breakage"
Diffstat (limited to 'org.eclipse.jgit.test/tst')
| -rw-r--r-- | org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java index 30e046ea51..63c63eaa27 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java @@ -89,7 +89,7 @@ public class ResolveMergerTest extends RepositoryTestCase { file = new File(db.getWorkTree(), "unrelated.txt"); write(file, "unrelated"); - git.add().addFilepattern("unrelated").call(); + git.add().addFilepattern("unrelated.txt").call(); RevCommit head = git.commit().setMessage("Adding another file").call(); // Untracked file to cause failing path for delete() of folder1 |