merge-recursive: teach was_dirty() about the virtualfilesystem

The idea of the virtual file system really is to tell Git to avoid
accessing certain paths. This fixes the case where a given path is not
yet included in the virtual file system and we are about to write a
conflicted version of it.

Author: dscho

Diff for: merge-recursive.c

@@ -9,6 +9,7 @@
 
 #include "git-compat-util.h"
 #include "merge-recursive.h"
+#include "virtualfilesystem.h"
 
 #include "alloc.h"
 #include "cache-tree.h"
@@ -876,7 +877,8 @@ static int was_dirty(struct merge_options *opt, const char *path)
 {
 	struct cache_entry *ce;
 
-	if (opt->priv->call_depth || !was_tracked(opt, path))
+	if (opt->priv->call_depth || !was_tracked(opt, path) ||
+	    is_excluded_from_virtualfilesystem(path, strlen(path), DT_REG) == 1)
 		return 0;
 
 	ce = index_file_exists(opt->priv->unpack_opts.src_index,