• Show log

    Commit

  • Hash : 7d307c1e
    Author : Edward Thomson
    Date : 2015-12-23T23:52:02

    merge driver: test GIT_EMERGECONFLICT
    
    When a `check` or `apply` callback function returns `GIT_EMERGECONFLICT`
    stop and product a conflict.