• Show log

    Commit

  • Hash : 61f1e31a
    Author : Edward Thomson
    Date : 2022-02-02T22:35:18

    Merge pull request #6197 from libgit2/ethomson/merge_msg_conflict_comment merge: comment conflicts lines in MERGE_MSG