global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-04 06:27:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
6bf035f2780bde45682e0edf40e35a150bd83706
git/diff-lib.c
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 Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink