![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 27 Apr 2005 16:21:00 +0000 (09:21 -0700) | ||
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Wed, 27 Apr 2005 16:21:00 +0000 (09:21 -0700) | ||
| commit | 91f192a90902952f40cf24be004e8df3508b16c8 | |
| tree | d2f1e3523866c7f1562a8bbc060b1a2110fe9bd7 | tree | snapshot |
| parent | f92a4465813b42b0c116bc9ab2a105ee19f076d8 | commit | diff |
[PATCH] Teach diff-tree-helper to handle unmerged paths.
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 <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
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 <junkio@cox.net>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| diff-tree-helper.c | diff | blob | history |