diff options
| author |  Junio C Hamano <junkio@cox.net> | 2007-02-25 22:24:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-25 22:25:30 -0800 |
| commit | 4fc970c43884e6215c13d6944a2def1eb2134ed5 (patch) | |
| tree | 19de8184265822e1c47a62847bdecd7eedc61372 /Makefile | |
| parent | Merge branch 'jc/merge-symlink' into maint (diff) | |
| download | tgif-4fc970c43884e6215c13d6944a2def1eb2134ed5.tar.xz | |
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>
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions