summaryrefslogtreecommitdiff
path: root/t/t3032-merge-recursive-options.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jn/cherry-pick-strategy-option'Junio C Hamano2011-02-091-0/+14
|\
| * cherry-pick/revert: add support for -X/--strategy-optionJonathan Nieder2010-12-281-0/+14
* | Merge branch 'rj/test-fixes'Junio C Hamano2011-01-131-1/+4
|\ \
| * | t3032-*.sh: Do not strip CR from line-endings while grepping on MinGWRamsay Jones2011-01-081-0/+1
| * | t3032-*.sh: Pass the -b (--binary) option to sed on cygwinRamsay Jones2011-01-081-1/+3
| |/
* | t3032: limit sed branch labels to 8 charactersBrandon Casey2011-01-061-3/+3
|/
* merge-recursive: options to ignore whitespace changesJustin Frankel2010-08-271-0/+186