summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-10-16 23:57:48 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-10-17 00:10:33 -0700
commit7641eb400f8dc1c8b8b0ca8f325c753ae566e156 (patch)
treee1040c294ba8c74c8f808161021b4b9084ac6399 /merge-recursive.c
parentMerge branch 'pv/maint-add-p-no-exclude' (diff)
parentGIT 1.6.5.1 (diff)
downloadtgif-7641eb400f8dc1c8b8b0ca8f325c753ae566e156.tar.xz
Merge branch 'maint'
* maint: GIT 1.6.5.1 grep: do not segfault when -f is used
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions