Merge branch 'fg/autocrlf'
authorJunio C Hamano <gitster@pobox.com>
Mon, 21 Jun 2010 13:02:47 +0000 (06:02 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 21 Jun 2010 13:02:47 +0000 (06:02 -0700)
* fg/autocrlf:
  autocrlf: Make it work also for un-normalized repositories

1  2 
convert.c

diff --cc convert.c
Simple merge