From: Edward Z. Yang <edwardzyang@thewritingpot.com>
Date: Mon, 23 Jun 2008 02:23:59 GMT
Subject: Re: core.autocrlf and merge conflict output
Message-ID: <485F093F.8020300@thewritingpot.com>
In-Reply-To: <alpine.DEB.1.00.0806230259140.6439@racer>

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Johannes Schindelin wrote:
> Funny.  And I thought 1.5.6 contained that patch...  Because 1.5.6 was 
> merged by Steffen recently, and announced on both the msysgit list as well 
> as this one.

And I'm wrong once again. My git checkout was on a detached head and
wasn't updating (apparently, I'm no good at reading error messages).
Switching back to master, pulling and then re-compiling fixed it.

While 99% of this is my fault, there might be a bug in netinstall.
However, I'm going to take that one to the msysgit list.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFIXwk/qTO+fYacSNoRAkIhAJ9LU6jH5ThQbu0tSjmkbp7ynEyh5wCdHvbJ
pFVPllbiXjfLrgEYuY+uVlM=
=ZxbH
-----END PGP SIGNATURE-----