• Show log

    Commit

  • Hash : b8e9467a
    Author : Edward Thomson
    Date : 2018-01-20T19:39:34

    merge: allow custom conflict marker size Allow for a custom conflict marker size, allowing callers to override the default size of the "<<<<<<<" and ">>>>>>>" markers in the conflicted output file.