Junio C Hamano 4fc970c438 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>

2007-02-25 22:25:30 -08:00

10 KiB

Raw Permalink Blame History

View Raw