summary refs log tree commit diff
path: root/t/t7602-merge-octopus-many.sh
AgeCommit message (Expand)AuthorFilesLines
2021-12-13t6000-t9999: detect and signal failure within loopEric Sunshine1-1/+1
2021-12-13tests: fix broken &&-chains in compound statementsEric Sunshine1-1/+1
2021-02-10tests: remove most uses of test_i18ncmpÆvar Arnfjörð Bjarmason1-3/+3
2020-10-26merge tests: expect slight differences in output for recursive vs. ortElijah Newren1-0/+6
2016-01-08t/t7602-merge-octopus-many.sh: use the $( ... ) construct for command substit...Elia Pinto1-4/+4
2012-04-30diff --stat: use less columns for change countsZbigniew Jędrzejewski-Szmek1-6/+6
2012-04-27Merge branch 'jc/merge-reduce-parents-early'Junio C Hamano1-5/+3
2012-04-17builtin/merge.c: reduce parents earlyJunio C Hamano1-1/+1
2012-04-17merge tests: octopus with redundant parentsMichał Kiedrowicz1-6/+4
2012-03-13test: use test_i18ncmp when checking --stat outputJonathan Nieder1-3/+3
2012-02-03Use correct grammar in diffstat summary lineNguyễn Thái Ngọc Duy1-3/+3
2011-05-25merge: reword the final messageJunio C Hamano1-3/+3
2010-11-09tests: add missing &&Jonathan Nieder1-1/+1
2009-12-13octopus: reenable fast-forward mergesStephen Boyd1-0/+18
2009-12-13octopus: make merge process simpler to followStephen Boyd1-0/+33
2008-09-03tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi1-1/+1
2008-07-07Build in mergeMiklos Vajna1-1/+1
2008-06-30Add new test to ensure git-merge handles more than 25 refs.Miklos Vajna1-0/+52