non-interactive rebase opens vim

I've started a non-interactive rebase (of 3 commits) which results in a
conflict for the first commit. After resolving the conflict, I've invoked

git rebase --continue

which brings up vim. I would not expect that. The main problem with this
behavior is that, when invoked from our GUI client, this results in the
client hanging forever. What forces git to open vim and how can I avoid
that?

git version 1.7.3.1.msysgit.0

--
Best regards,
Marc Strapetz
=============
syntevo GmbH
http://www.syntevo.com
http://blog.syntevo.com

Excerpts from Marc Strapetz's message of Wed Feb 23 14:21:08 +0100 2011:

which brings up vim. I would not expect that. The main problem with this
behavior is that, when invoked from our GUI client, this results in the
client hanging forever. What forces git to open vim and how can I avoid
that?

Maybe use gvim --nofork as editor?
Its not a true fix.. but the most simple workaround which comes to my
mind.

Marc Weber