• Show log

    Commit

  • Hash : 7f52bc5a
    Author : Edward Thomson
    Date : 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.