diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-04-26 17:39:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-26 17:39:01 -0700 |
| commit | 0b32ff0dd99136719f0977ba1470894d6d3ab430 (patch) | |
| tree | 69b59343ff93d3abc4cd696d5b155d5e60f05e53 /diff-cache.c | |
| parent | b8a55ce71d0d46204d64fe35787956e994d2a802 (diff) | |
| download | git-0b32ff0dd99136719f0977ba1470894d6d3ab430.tar.gz | |
[PATCH] diff-cache/tree compatible output for show-diff (take 2).
This makes diff-tree-helper handle ("warn about") unmerged path entries
U <path> <record-terminator>
This is emitted once per unmerged path, no matter how many unmerged
stages there are.
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