• Show log

    Commit

  • Hash : aded938e
    Author : Edward Thomson
    Date : 2022-02-12T21:23:01

    Merge pull request #6204 from boretrk/merge_flags merge: fix overlap between GIT_MERGE_FILE_FAVOR__CONFLICTED and GIT_MERGE_FILE_SIMPLIFY_ALNUM