Commit 7f52bc5a0f4614608ec0dc47edb1ae64f1b9e941
2018-01-20T18:19:26
xdiff: upgrade to git's included xdiff Upgrade xdiff to git's most recent version, which includes changes to CR/LF handling. Now CR/LF included in the input files will be detected and conflict markers will be emitted with CR/LF when appropriate.