diff options
| author |  Johannes Sixt <johannes.sixt@telecom.at> | 2007-03-03 20:38:00 +0100 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2007-03-03 19:30:34 -0800 |
| commit | a249a9b5a26e841a28f6e993a560d749303cf91c (patch) | |
| tree | 7ba145ca3cb4d8f1acba75e7091a1953128a7e91 /diff-lib.c | |
| parent | Handle core.symlinks=false case in merge-recursive. (diff) | |
| download | tgif-a249a9b5a26e841a28f6e993a560d749303cf91c.tar.xz | |
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 <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff-lib.c')
0 files changed, 0 insertions, 0 deletions