summaryrefslogtreecommitdiff
path: root/t/t3502-cherry-pick-merge.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-04-03 12:28:39 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-04-03 12:28:39 -0700
commit07b838f087a1535e387d5d4a1414b2b545b73265 (patch)
tree8779dd5e4854e5dd9c3dbe09daa80eea0ed0c7da /t/t3502-cherry-pick-merge.sh
parentMerge branch 'bc/maint-daemon-sans-ss-family' (diff)
parentgrep: enable threading for context line printing (diff)
downloadtgif-07b838f087a1535e387d5d4a1414b2b545b73265.tar.xz
Merge branch 'rs/threaded-grep-context'
* rs/threaded-grep-context: grep: enable threading for context line printing Conflicts: grep.c
Diffstat (limited to 't/t3502-cherry-pick-merge.sh')
0 files changed, 0 insertions, 0 deletions