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.