• Show log

    Commit

  • Hash : 8683d31f
    Author : Edward Thomson
    Date : 2015-10-22T14:39:20

    merge: add GIT_MERGE_TREE_FAIL_ON_CONFLICT
    
    Provide a new merge option, GIT_MERGE_TREE_FAIL_ON_CONFLICT, which
    will stop on the first conflict and fail the merge operation with
    GIT_EMERGECONFLICT.