summaryrefslogtreecommitdiff
path: root/t/t6032-merge-large-rename.sh
Commit message (Expand)AuthorAgeFilesLines
* t: fix &&-chaining issues around setup which might failJeff King2015-03-201-3/+3
* tests: modernise style: more uses of test_line_countStefano Lattarini2012-04-111-1/+1
* t: use sane_unset instead of unsetÆvar Arnfjörð Bjarmason2012-02-131-1/+1
* t6032: Add a test checking for excessive output from mergeElijah Newren2010-09-291-0/+30
* add merge.renamelimit config optionJeff King2008-05-031-0/+73