Merge branch 'ms/send-email-validate-fix'

[thirdparty/git.git] / rerere.c

diff --git a/rerere.c b/rerere.c
index 725c1b6a95cdedd89152a0f80b8fe2477751458e..09e19412859b3edb7be4142947d3967fc76520cc 100644 (file)
--- a/rerere.c
+++ b/rerere.c
@@ -1112,7 +1112,7 @@ int rerere_forget(struct repository *r, struct pathspec *pathspec)
         * recover the original conflicted state and then
         * find the conflicted paths.
         */
-       unmerge_index(r->index, pathspec);
+       unmerge_index(r->index, pathspec, 0);
        find_conflict(r, &conflict);
        for (i = 0; i < conflict.nr; i++) {
                struct string_list_item *it = &conflict.items[i];