Commit f78bb2afb3a7f23264c4adf2e9debfa415ca8107

Edward Thomson 2015-03-18T01:54:04

stash: return GIT_EMERGECONFLICT on merge conflict