summaryrefslogtreecommitdiff
path: root/builtin-merge-ours.c
diff options
context:
space:
mode:
authorLibravatar Daniel Barkalow <barkalow@iabervon.org>2008-05-20 14:15:14 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-05-21 11:11:58 -0700
commitfdabc242f465771116e08d1ea3737fdb7453b2f1 (patch)
tree0a544d0b791cf9a53298e5f91ad2e5fd0d28e65c /builtin-merge-ours.c
parentbuiltin-clone.c: Need to closedir() in copy_or_link_directory() (diff)
downloadtgif-fdabc242f465771116e08d1ea3737fdb7453b2f1.tar.xz
clone: fall back to copying if hardlinking fails
Note that it stops trying hardlinks if any fail. Signed-off-by: Daniel Barkalow <barkalow@iabervon.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-merge-ours.c')
0 files changed, 0 insertions, 0 deletions