summaryrefslogtreecommitdiff
path: root/t/t7602-merge-octopus-many.sh
AgeCommit message (Expand)Author
2020-10-26merge tests: expect slight differences in output for recursive vs. ortElijah Newren
2016-01-08t/t7602-merge-octopus-many.sh: use the $( ... ) construct for command substit...Elia Pinto
2012-04-30diff --stat: use less columns for change countsZbigniew Jędrzejewski-Szmek
2012-04-27Merge branch 'jc/merge-reduce-parents-early'Junio C Hamano
2012-04-18builtin/merge.c: reduce parents earlyJunio C Hamano
2012-04-18merge tests: octopus with redundant parentsMichał Kiedrowicz
2012-03-13test: use test_i18ncmp when checking --stat outputJonathan Nieder
2012-02-04Use correct grammar in diffstat summary lineNguyễn Thái Ngọc Duy
2011-05-25merge: reword the final messageJunio C Hamano
2010-11-09tests: add missing &&Jonathan Nieder
2009-12-14octopus: reenable fast-forward mergesStephen Boyd
2009-12-14octopus: make merge process simpler to followStephen Boyd
2008-09-03tests: use "git xyzzy" form (t7200 - t9001)Nanako Shiraishi
2008-07-08Build in mergeMiklos Vajna
2008-07-01Add new test to ensure git-merge handles more than 25 refs.Miklos Vajna