summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorMatthieu Moy <Matthieu.Moy@imag.fr>2010-09-03 17:25:33 +0200
committerJunio C Hamano <gitster@pobox.com>2010-09-03 09:31:59 -0700
commitc5978a507ca20b12008724f78237784193fb9489 (patch)
tree7d70ed40ebb26168df3f9d2fa8c61d3e4aefd208 /merge-recursive.h
parent5e65ee35ddd306d6e6c86efc1c95315942f87811 (diff)
downloadgit-c5978a507ca20b12008724f78237784193fb9489.tar.gz
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>
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions