diff options
Diffstat (limited to 'diff-tree-helper.c')
| -rw-r--r-- | diff-tree-helper.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diff-tree-helper.c b/diff-tree-helper.c index 4167d11e00..f3efc8a6f2 100644 --- a/diff-tree-helper.c +++ b/diff-tree-helper.c @@ -56,7 +56,7 @@ static int parse_diff_tree_output(const char *buf, switch (*cp++) { case 'U': - fprintf(stderr, "warning: unmerged path %s\n", cp+1); + diff_unmerge(cp + 1); return WARNED_OURSELVES; case '+': old->file_valid = 0; |