summaryrefslogtreecommitdiff
path: root/t/t7609-merge-co-error-msgs.sh
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'sb/unpack-trees-grammofix'Junio C Hamano2016-12-191-1/+1
|\
| * unpack-trees: fix grammar for untracked files in directoriessb/unpack-trees-grammofixStefan Beller2016-12-051-1/+1
* | unpack-trees: fix English grammar in do-this-before-that messagesah/unpack-trees-advice-messagesAlex Henrie2016-06-271-5/+5
|/
* i18n: unpack-trees: avoid substituting only a verb in sentencesva/i18n-misc-updatesVasco Almeida2016-05-121-9/+9
* unpack-trees: print "Aborting" to stderrMichael J Gruber2011-09-211-0/+5
* use persistent memory for rejected pathsClemens Buchacher2010-11-151-8/+8
* t7609-merge-co-error-msgs: test non-fast forward case too.Matthieu Moy2010-09-031-2/+10
* t7609: test merge and checkout error messagesDiane Gasselin2010-08-111-0/+125