From: Edward Z. Yang <edwardzyang@thewritingpot.com>
Date: Mon, 23 Jun 2008 01:47:36 GMT
Subject: Re: core.autocrlf and merge conflict output
Message-ID: <g3mvbh$mmj$1@ger.gmane.org>
In-Reply-To: <7vy74xj7ww.fsf@gitster.siamese.dyndns.org>

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

Junio C Hamano wrote:
> Is this an old news before 249c61a (merge-recursive: respect core.autocrlf
> when writing out the result, 2008-06-09) happened?

Apparently, yes. :o) Thus are the perils of working off a "downstream"
branch. I'll go bug the git/mingw/4msysgit.git maintainers to get this
change merged in. Thanks!
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFIXwC4qTO+fYacSNoRAi8RAJ4/ZF0C0XB9QSPgCnQYae/33YSRUgCff/y5
5Dd9vy/pQQsNJbyQ+xfc4lY=
=fyGn
-----END PGP SIGNATURE-----