summaryrefslogtreecommitdiff
path: root/t/t3032-merge-recursive-options.sh
AgeCommit message (Expand)AuthorFilesLines
2013-07-18test-lib.sh - define and use GREP_STRIPS_CRLibravatar Mark Levedahl1-1/+1
2011-02-09Merge branch 'jn/cherry-pick-strategy-option'Libravatar Junio C Hamano1-0/+14
2011-01-13Merge branch 'rj/test-fixes'Libravatar Junio C Hamano1-1/+4
2011-01-08t3032-*.sh: Do not strip CR from line-endings while grepping on MinGWLibravatar Ramsay Jones1-0/+1
2011-01-08t3032-*.sh: Pass the -b (--binary) option to sed on cygwinLibravatar Ramsay Jones1-1/+3
2011-01-06t3032: limit sed branch labels to 8 charactersLibravatar Brandon Casey1-3/+3
2010-12-28cherry-pick/revert: add support for -X/--strategy-optionLibravatar Jonathan Nieder1-0/+14
2010-08-27merge-recursive: options to ignore whitespace changesLibravatar Justin Frankel1-0/+186