Andrew's git / gitweb.git / diff
?
diff --cc: fix display of symlink conflicts during a merge.
authorJunio C Hamano <junkio@cox.net>
Mon, 26 Feb 2007 06:24:47 +0000 (22:24 -0800)
committerJunio C Hamano <junkio@cox.net>
Mon, 26 Feb 2007 06:25:30 +0000 (22:25 -0800)
"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>
No differences found