aboutsummaryrefslogtreecommitdiff
path: root/t/t6032-merge-large-rename.sh
Commit message (Expand)AuthorAge
* t: fix &&-chaining issues around setup which might failJeff King2015-03-20
* tests: modernise style: more uses of test_line_countStefano Lattarini2012-04-11
* t: use sane_unset instead of unsetÆvar Arnfjörð Bjarmason2012-02-13
* t6032: Add a test checking for excessive output from mergeElijah Newren2010-09-29
* add merge.renamelimit config optionJeff King2008-05-03