summaryrefslogtreecommitdiff
path: root/t/t6028-merge-up-to-date.sh
AgeCommit message (Expand)AuthorFilesLines
2012-04-17builtin/merge.c: reduce parents earlyLibravatar Junio C Hamano1-1/+1
2012-04-17merge tests: octopus with redundant parentsLibravatar MichaƂ Kiedrowicz1-1/+16
2009-10-24Use 'fast-forward' all over the placeLibravatar Felipe Contreras1-1/+1
2007-08-27git-merge: do up-to-date check also for all strategiesLibravatar Junio C Hamano1-0/+77