[PATCH] Teach diff-tree-helper to handle unmerged paths.

Junio C Hamano · Linus Torvalds · commit 91f192a90902 · 2005-04-27T09:21:00.000-07:00
This teaches diff-tree-helper to call diff_unmerge() so that it can
report unmerged paths to GIT_EXTERNAL_DIFF, instead of consuming it on
its own. 

Signed-off-by: Junio C Hamano &lt;junkio@cox.net&gt;
Signed-off-by: Linus Torvalds &lt;torvalds@osdl.org&gt;
diff --git 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;
