motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Add the intended file to avoid breakage"

This commit is contained in:
Christian Halstrick 2012-09-25 16:41:56 -04:00 committed by Gerrit Code Review @ Eclipse.org
parent bc66934a83 2531d939e4
commit 01a33350ee
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.eclipse.jgit.test/tst/org/eclipse/jgit/merge/ResolveMergerTest.java
View File

@ -89,7 +89,7 @@ public void failingPathsShouldNotResultInOKReturnValue() throws Exception {
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