summaryrefslogtreecommitdiff
path: root/merge-tree.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-08-26 17:08:25 -0700
committerJunio C Hamano <gitster@pobox.com>2008-08-26 17:08:25 -0700
commitcb138fede603d5b950c72b11382a28e40177a639 (patch)
tree1a275a10d9eeb693c3f533b69cf09e8be51c2e2b /merge-tree.c
parentc7f72248e3da96299d925aece0f00a46f5f86334 (diff)
parent3e073dc561185d5ad2325cb012943020e068801e (diff)
downloadgit-cb138fede603d5b950c72b11382a28e40177a639.tar.gz
Merge branch 'af/maint-install-no-handlink'
* af/maint-install-no-handlink: Makefile: always provide a fallback when hardlinks fail
Diffstat (limited to 'merge-tree.c')
0 files changed, 0 insertions, 0 deletions