The sixth batch

[thirdparty/git.git] / diff.c

diff --git a/diff.c b/diff.c
index 108c1875775df223c4ca4f9dec27194033a7cfaa..ded9ac70df31cce3168d4a01679d54832f3ad5b9 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -4555,6 +4555,7 @@ static void run_diff_cmd(const char *pgm,
                             o, complete_rewrite);
        } else {
                fprintf(o->file, "* Unmerged path %s\n", name);
+               o->found_changes = 1;
        }
 }