• Show log

    Commit

  • Hash : 26f5d36d
    Author : Edward Thomson
    Date : 2018-02-04T10:27:39

    Merge pull request #4489 from libgit2/ethomson/conflicts_crlf Conflict markers should match EOL style in conflicting files