Re: core.autocrlf and merge conflict output

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi,

On Sun, 22 Jun 2008, Edward Z. Yang wrote:

> 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!

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.

Ciao,
Dscho

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]

  Powered by Linux