diff options
| author | Shawn Pearce <spearce@spearce.org> | 2011-08-13 17:08:40 -0400 |
|---|---|---|
| committer | Code Review <codereview-daemon@eclipse.org> | 2011-08-13 17:08:40 -0400 |
| commit | a2eadf0b6745103c1acac0494583f056351269be (patch) | |
| tree | ce05489d18f4a8fc964c3f687e00173e278f8702 /org.eclipse.jgit/src | |
| parent | ac9d9ee96de528e6042c079217a656307dde5f8b (diff) | |
| parent | dcf9ba411b6661efbfd0acc53eb8ef9e5dc1e1f1 (diff) | |
| download | jgit-a2eadf0b6745103c1acac0494583f056351269be.tar.gz jgit-a2eadf0b6745103c1acac0494583f056351269be.zip | |
Merge "Ignore missing MERGE_MSG when deleting MERGE_MSG"
Diffstat (limited to 'org.eclipse.jgit/src')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java index aab8a8e619..b51a954ca9 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/Repository.java @@ -1137,7 +1137,7 @@ public abstract class Repository { fos.close(); } } else { - FileUtils.delete(mergeMsgFile); + FileUtils.delete(mergeMsgFile, FileUtils.SKIP_MISSING); } } |