summaryrefslogtreecommitdiff
path: root/builtin-merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-03-04 22:25:23 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-03-04 22:25:23 -0800
commitce5044df2a29c4f4979089b072aad43bccb3b9fd (patch)
tree1432db3858c686410831714052e52fbf4b7bdcdc /builtin-merge-recursive.c
parentMerge branch 'maint-1.6.6' into maint (diff)
parentbisect: error out when passing bad path parameters (diff)
downloadtgif-ce5044df2a29c4f4979089b072aad43bccb3b9fd.tar.xz
Merge branch 'cc/maint-bisect-paths' into maint
* cc/maint-bisect-paths: bisect: error out when passing bad path parameters
Diffstat (limited to 'builtin-merge-recursive.c')
0 files changed, 0 insertions, 0 deletions