git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 723024d)
Tell multi-parent diff about core.symlinks.
authorJohannes Sixt <redacted>
Sat, 3 Mar 2007 19:38:00 +0000 (20:38 +0100)
committerJunio C Hamano <redacted>
Sun, 4 Mar 2007 03:30:34 +0000 (19:30 -0800)
commita249a9b5a26e841a28f6e993a560d749303cf91c
tree7ba145ca3cb4d8f1acba75e7091a1953128a7e91tree | snapshot
parent723024d696a47556baac77700e47fef288691f37commit | diff
Tell multi-parent diff about core.symlinks.

When core.symlinks is false, and a merge of symbolic links had conflicts,
the merge result is left as a file in the working directory. A decision
must be made whether the file is treated as a regular file or as a
symbolic link. This patch treats the file as a symbolic link only if
all merge parents were also symbolic links.

Signed-off-by: Johannes Sixt <redacted>
Signed-off-by: Junio C Hamano <redacted>
combine-diff.c diff | blob | history
git clone https://git.99rst.org/PROJECT