summaryrefslogtreecommitdiff
path: root/t/t6032-merge-large-rename.sh
AgeCommit message (Expand)Author
2012-04-11tests: modernise style: more uses of test_line_countStefano Lattarini
2012-02-13t: use sane_unset instead of unsetÆvar Arnfjörð Bjarmason
2010-09-30t6032: Add a test checking for excessive output from mergeElijah Newren
2008-05-03add merge.renamelimit config optionJeff King