Merge branch 'jc/maint-diff-core-safecrlf' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Jul 2013 05:48:13 +0000 (22:48 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Jul 2013 05:48:13 +0000 (22:48 -0700)
commit82ec54dc8bbb653faa64638d74129e45aea3326b
treed3ca5f57694f8551da4a8fec7feb0f6504e59b90
parent7c8ce4ed32aec3b86a271c2661ad9dfb0084c3f9
parent5430bb283b478991a979437a79e10dcbb6f20e28
Merge branch 'jc/maint-diff-core-safecrlf' into maint

Avoid failing "git diff" when core.safecrlf is set to true, because
the user cannot tell where the breakage is in preparation for fixing
and committing.

* jc/maint-diff-core-safecrlf:
  diff: demote core.safecrlf=true to core.safecrlf=warn
diff.c