diff options
author | Junio C Hamano <gitster@pobox.com> | 2008-09-10 02:13:41 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2008-09-10 02:13:41 -0700 |
commit | 94c27881bd98d5bb70e3d4f8a18e384095c876b9 (patch) | |
tree | afb52cefd82080596aa910bb3e84b75e1d10ee9a /xdiff-interface.h | |
parent | Merge branch 'np/maint-safer-pack' into maint (diff) | |
parent | checkout: do not check out unmerged higher stages randomly (diff) | |
download | tgif-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 'xdiff-interface.h')
0 files changed, 0 insertions, 0 deletions