• Show log

    Commit

  • Hash : c0297d47
    Author : Edward Thomson
    Date : 2022-01-30T22:38:08

    merge: comment conflicts lines in MERGE_MSG git has started adding comment markers to its conflict lines in MERGE_MSG. Match that behavior.