• Show log

    Commit

  • Hash : cc605e73
    Author : Edward Thomson
    Date : 2015-06-23T23:52:03

    Merge pull request #3222 from git-up/conflicted Fixed GIT_DELTA_CONFLICTED not returned in some cases