• Show log

    Commit

  • Hash : a202e0d4
    Author : Edward Thomson
    Date : 2016-02-11T10:11:21

    rebase: allow custom merge_options Allow callers of rebase to specify custom merge options. This may allow custom conflict resolution, or failing fast when conflicts are detected.