xdl_merge(): allow passing down marker_size in xmparam_t
[gitweb.git] / builtin-read-tree.c
index 2a3a32cbfe83a0e0366d04a99bb49606f647f594..7d378b75480331b242410b9680399728efbae49d 100644 (file)
@@ -13,6 +13,7 @@
 #include "dir.h"
 #include "builtin.h"
 #include "parse-options.h"
+#include "resolve-undo.h"
 
 static int nr_trees;
 static struct tree *trees[MAX_UNPACK_TREES];
@@ -122,6 +123,7 @@ int cmd_read_tree(int argc, const char **argv, const char *unused_prefix)
                        die("You need to resolve your current index first");
                stage = opts.merge = 1;
        }
+       resolve_undo_clear();
 
        for (i = 0; i < argc; i++) {
                const char *arg = argv[i];