Tell multi-parent diff about core.symlinks.
authorJohannes Sixt <johannes.sixt@telecom.at>
Sat, 3 Mar 2007 19:38:00 +0000 (20:38 +0100)
committerJunio C Hamano <junkio@cox.net>
Sun, 4 Mar 2007 03:30:34 +0000 (19:30 -0800)
commita249a9b...a26e841a28f6e993a560d749303cf91c
tree7ba145c...3cb4d8f1acba75e7091a1953128a7e91copy hash to clipboard (tree)
parent723024d...96a47556baac77700e47fef288691f37copy hash to clipboard (diff)
combine-diff.c