summaryrefslogtreecommitdiff
path: root/t/t6028-merge-up-to-date.sh
Commit message (Expand)AuthorAgeFilesLines
* builtin/merge.c: reduce parents earlyJunio C Hamano2012-04-171-1/+1
* merge tests: octopus with redundant parentsMichaƂ Kiedrowicz2012-04-171-1/+16
* Use 'fast-forward' all over the placeFelipe Contreras2009-10-241-1/+1
* git-merge: do up-to-date check also for all strategiesJunio C Hamano2007-08-271-0/+77