diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
index dba89709a..8e70f57fa 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/merge/ResolveMerger.java
@@ -350,15 +350,8 @@ protected void cleanUp() throws NoWorkTreeException,
 		while(mpathsIt.hasNext()) {
 			String mpath=mpathsIt.next();
 			DirCacheEntry entry = dc.getEntry(mpath);
-			if (entry == null)
-				continue;
-			FileOutputStream fos = new FileOutputStream(new File(
-					db.getWorkTree(), mpath));
-			try {
-				reader.open(entry.getObjectId()).copyTo(fos);
-			} finally {
-				fos.close();
-			}
+			if (entry != null)
+				DirCacheCheckout.checkoutEntry(db, entry, reader);
 			mpathsIt.remove();
 		}
 	}