summaryrefslogtreecommitdiff
path: root/t/t1000-read-tree-m-3way.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-06-30 11:55:38 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-06-30 11:55:38 -0700
commit6f82be05191a4ec2adcbcac65078f87900ea8741 (patch)
tree26bf74e9fdd311cce2f1d63e3a42af30d30b8edb /t/t1000-read-tree-m-3way.sh
parentMerge branch 'jp/string-list-api-cleanup' (diff)
parentMerge branch 'jp/string-list-api-cleanup' into jn/grep-open (diff)
downloadtgif-6f82be05191a4ec2adcbcac65078f87900ea8741.tar.xz
Merge branch 'jn/grep-open'
* jn/grep-open: t/t7811-grep-open.sh: remove broken/redundant creation of fake "less" script t/t7811-grep-open.sh: ensure fake "less" is made executable t/lib-pager.sh: remove unnecessary '^' from 'expr' regular expression grep -O: allow optional argument specifying the pager (or editor) grep: Add the option '--open-files-in-pager' Unify code paths of threaded greps grep: refactor grep_objects loop into its own function Conflicts: t/t7006-pager.sh
Diffstat (limited to 't/t1000-read-tree-m-3way.sh')
0 files changed, 0 insertions, 0 deletions