Merge branch 'js/merge-recursive'
authorJunio C Hamano <gitster@pobox.com>
Mon, 9 Jun 2008 23:13:10 +0000 (16:13 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 9 Jun 2008 23:13:10 +0000 (16:13 -0700)
commitea81e10ff4e31820407f4cb1b8ebd87de9e51737
treecf8b40877e775412070288c0086fb9b70a09e6b3
parent5bcde3082d5f348ff8b02547126746b9b713c8d5
parent249c61a62d82c22df98cb72ec61c120887b944e1
Merge branch 'js/merge-recursive'

* js/merge-recursive:
  merge-recursive: respect core.autocrlf when writing out the result
  Add testcase for merging in a CRLF repo
builtin-merge-recursive.c