![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <junkio@cox.net> | |
| Mon, 26 Feb 2007 06:24:47 +0000 (22:24 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Mon, 26 Feb 2007 06:25:30 +0000 (22:25 -0800) | ||
| commit | 4fc970c43884e6215c13d6944a2def1eb2134ed5 | |
| tree | 19de8184265822e1c47a62847bdecd7eedc61372 | tree | snapshot |
| parent | 0b1f6475570b915c56f380f2bd790ff94e606ef4 | commit | diff |
diff --cc: fix display of symlink conflicts during a merge.
"git-diff-files --cc" to show conflicts during merge did not pass
the correct mode information for the working tree down, and showed
bogus combined diff.
Signed-off-by: Junio C Hamano <junkio@cox.net>
"git-diff-files --cc" to show conflicts during merge did not pass
the correct mode information for the working tree down, and showed
bogus combined diff.
Signed-off-by: Junio C Hamano <junkio@cox.net>
| combine-diff.c | diff | blob | history | |
| diff-lib.c | diff | blob | history |