summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-09-10 02:13:41 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-09-10 02:13:41 -0700
commit94c27881bd98d5bb70e3d4f8a18e384095c876b9 (patch)
treeafb52cefd82080596aa910bb3e84b75e1d10ee9a /merge-recursive.h
parentMerge branch 'np/maint-safer-pack' into maint (diff)
parentcheckout: do not check out unmerged higher stages randomly (diff)
downloadtgif-94c27881bd98d5bb70e3d4f8a18e384095c876b9.tar.xz
Merge branch 'jc/maint-checkout-fix' into maint
* jc/maint-checkout-fix: checkout: do not check out unmerged higher stages randomly
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions