Merge "Ignore missing MERGE_MSG when deleting MERGE_MSG"

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);
 		}
 	}