diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-04-27 09:21:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-27 09:21:00 -0700 |
| commit | 91f192a90902952f40cf24be004e8df3508b16c8 (patch) | |
| tree | d2f1e3523866c7f1562a8bbc060b1a2110fe9bd7 /diff-cache.c | |
| parent | f92a4465813b42b0c116bc9ab2a105ee19f076d8 (diff) | |
| download | git-91f192a90902952f40cf24be004e8df3508b16c8.tar.gz git-91f192a90902952f40cf24be004e8df3508b16c8.tar.xz | |
[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>
Diffstat (limited to 'diff-cache.c')
0 files changed, 0 insertions, 0 deletions