From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 9 Jun 2008 23:13:10 +0000 (-0700)
Subject: Merge branch 'js/merge-recursive'
X-Git-Tag: v1.5.6-rc3~32
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ea81e10ff4e31820407f4cb1b8ebd87de9e51737;p=git.git

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

ea81e10ff4e31820407f4cb1b8ebd87de9e51737