summaryrefslogtreecommitdiff
path: root/t/t7609-merge-co-error-msgs.sh
AgeCommit message (Expand)Author
2016-12-19Merge branch 'sb/unpack-trees-grammofix'Junio C Hamano
2016-12-05unpack-trees: fix grammar for untracked files in directoriesStefan Beller
2016-06-27unpack-trees: fix English grammar in do-this-before-that messagesAlex Henrie
2016-05-12i18n: unpack-trees: avoid substituting only a verb in sentencesVasco Almeida
2011-09-21unpack-trees: print "Aborting" to stderrMichael J Gruber
2010-11-15use persistent memory for rejected pathsClemens Buchacher
2010-09-03t7609-merge-co-error-msgs: test non-fast forward case too.Matthieu Moy
2010-08-11t7609: test merge and checkout error messagesDiane Gasselin