aboutsummaryrefslogtreecommitdiff
path: root/t/t7609-merge-co-error-msgs.sh
Commit message (Expand)AuthorAge
* Merge branch 'sb/unpack-trees-grammofix'Junio C Hamano2016-12-19
|\
| * unpack-trees: fix grammar for untracked files in directoriesStefan Beller2016-12-05
* | unpack-trees: fix English grammar in do-this-before-that messagesAlex Henrie2016-06-27
|/
* i18n: unpack-trees: avoid substituting only a verb in sentencesVasco Almeida2016-05-12
* unpack-trees: print "Aborting" to stderrMichael J Gruber2011-09-21
* use persistent memory for rejected pathsClemens Buchacher2010-11-15
* t7609-merge-co-error-msgs: test non-fast forward case too.Matthieu Moy2010-09-03
* t7609: test merge and checkout error messagesDiane Gasselin2010-08-11