• Show log

    Commit

  • Hash : f78bb2af
    Author : Edward Thomson
    Date : 2015-03-18T01:54:04

    stash: return GIT_EMERGECONFLICT on merge conflict