diff options
author | Junio C Hamano <junkio@cox.net> | 2005-12-02 08:54:50 (GMT) |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2005-12-02 09:08:14 (GMT) |
commit | 54dd99a127caf4d20e1b91a43949655763d188ed (patch) | |
tree | 0280c431c8e48fdd702c8c15ce4cc6b89262c583 /Documentation/git-read-tree.txt | |
parent | 1c2c10b6e6d86066d68635a2a968c7162498ea41 (diff) | |
download | git-54dd99a127caf4d20e1b91a43949655763d188ed.zip git-54dd99a127caf4d20e1b91a43949655763d188ed.tar.gz git-54dd99a127caf4d20e1b91a43949655763d188ed.tar.bz2 |
merge-one-file: make sure we do not mismerge symbolic links.
We ran "merge" command on O->A, O->B, A!=B case without
verifying the path involved is not a symlink.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-read-tree.txt')
0 files changed, 0 insertions, 0 deletions