Subject: Re: Merge problems with git-mingw

From: Johannes Sixt <[email-masked]>
Date: Tue, 09 Oct 2007 09:36:30 +0200

Peter Karlsson schrieb:
> I get the same error running mingw-git from a regular cmd.exe prompt,
> so it doesn't seem to be related to Cygwin at all.

What if you run 'git var -l' outside a repository? From CMD?
Have you tried 'git-var -l' (note the dash)? From CMD?
Are you sure you have only one version of git in the PATH?
What's in your .git/config?

-- Hannes