• Show log

    Commit

  • Hash : 2a8841ae
    Author : Edward Thomson
    Date : 2018-01-21T12:28:13

    merge: test CR/LF conflicts for CR/LF files Ensure that when the files being merged have CR/LF line endings that the conflict markers produced in the conflict file also have CR/LF line endings.