summaryrefslogtreecommitdiff
path: root/t/t7609-merge-co-error-msgs.sh
AgeCommit message (Expand)AuthorFilesLines
2017-01-17Merge branch 'sb/unpack-trees-grammofix' into maintLibravatar Junio C Hamano1-1/+1
2016-12-05unpack-trees: fix grammar for untracked files in directoriesLibravatar Stefan Beller1-1/+1
2016-06-27unpack-trees: fix English grammar in do-this-before-that messagesLibravatar Alex Henrie1-5/+5
2016-05-12i18n: unpack-trees: avoid substituting only a verb in sentencesLibravatar Vasco Almeida1-9/+9
2011-09-21unpack-trees: print "Aborting" to stderrLibravatar Michael J Gruber1-0/+5
2010-11-15use persistent memory for rejected pathsLibravatar Clemens Buchacher1-8/+8
2010-09-03t7609-merge-co-error-msgs: test non-fast forward case too.Libravatar Matthieu Moy1-2/+10
2010-08-11t7609: test merge and checkout error messagesLibravatar Diane Gasselin1-0/+125