projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0b1f647) | patch
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)
commit4fc970c43884e6215c13d6944a2def1eb2134ed5
tree19de8184265822e1c47a62847bdecd7eedc61372tree | snapshot
parent0b1f6475570b915c56f380f2bd790ff94e606ef4commit | 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>
combine-diff.c diff | blob | history
diff-lib.c diff | blob | history
Git—the stupid content tracker