![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 27 Apr 2005 00:39:01 +0000 (17:39 -0700) | ||
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
| Wed, 27 Apr 2005 00:39:01 +0000 (17:39 -0700) | ||
| commit | 0b32ff0dd99136719f0977ba1470894d6d3ab430 | |
| tree | 69b59343ff93d3abc4cd696d5b155d5e60f05e53 | tree | snapshot |
| parent | b8a55ce71d0d46204d64fe35787956e994d2a802 | commit | diff |
[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>
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>
| diff-tree-helper.c | diff | blob | history |