t7609-merge-co-error-msgs: test non-fast forward case too.
authorMatthieu Moy <Matthieu.Moy@imag.fr>
Fri, 3 Sep 2010 15:25:33 +0000 (17:25 +0200)
committerJunio C Hamano <gitster@pobox.com>
Fri, 3 Sep 2010 16:31:59 +0000 (09:31 -0700)
commitc5978a507ca20b12008724f78237784193fb9489
tree7d70ed40ebb26168df3f9d2fa8c61d3e4aefd208
parent5e65ee35ddd306d6e6c86efc1c95315942f87811
t7609-merge-co-error-msgs: test non-fast forward case too.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t7609-merge-co-error-msgs.sh