Merge "Ignore missing MERGE_MSG when deleting MERGE_MSG"

13 years ago · a2eadf0b67
1 changed files with 1 additions and 1 deletions
--- 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);
 		}
 	}