WinGit broken when merging
Problem is that git-var does not work when you type ‘git var’, but only when you type ‘git-var’. WinGit version is 0.2. So, the merge script bails out with message.
To fix, edit:
c:\Program Files\Git\bin\git-merge
and change all ‘git var’ to ‘git-var’ and you’re done.
Tweet to @mbabuskov Tweet Milan Babuškov, 2008-09-18