• Show log

    Commit

  • Hash : 9d8510b3
    Author : Edward Thomson
    Date : 2018-01-31T09:28:43

    Merge pull request #4488 from libgit2/ethomson/conflict_marker_size Use longer conflict markers in recursive merge base