summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-09-02 13:18:37 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-09-02 13:18:37 -0700
commit8e969454e1588e506df20f552aa8622b6517ea20 (patch)
treea345924eb07a555121bbd5dcbae39557396fcc2b /builtin/merge-recursive.c
parentMerge branch 'va/p4-branch-import-test-update' (diff)
parentt6030: use $SHELL_PATH to invoke user's preferred shell instead of bare sh (diff)
downloadtgif-8e969454e1588e506df20f552aa8622b6517ea20.tar.xz
Merge branch 'bc/bisect-test-use-shell-path'
* bc/bisect-test-use-shell-path: t6030: use $SHELL_PATH to invoke user's preferred shell instead of bare sh
Diffstat (limited to 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions