Re: 'Theirs' merge between branches on a binary file.

Tim Visher schrieb:

I'm now working on
compiling git under cygwin as the latest version cygwin installs for
you is 0.4!

Have you seen msysgit (http://code.google.com/p/msysgit/), the easy
route to git on Windows?  It has all you need to check out and compile
the latest version of git.

René