Merge "[findBugs] Fix NP_LOAD_OF_KNOWN_NULL_VALUE"

org.eclipse.jgit/src/org/eclipse/jgit/dircache/DirCacheCheckout.java

@@ -406,7 +406,7 @@ public class DirCacheCheckout {
 			// File/Directory conflict case #20
 			if (walk.isDirectoryFileConflict())
 				// TODO: check whether it is always correct to report a conflict here
-				conflict(name, null, h, m);
+				conflict(name, null, null, null);
 
 			// file only exists in working tree -> ignore it
 			return;