Commit 64be170d4786f5cc782d8d124cee0c1e2969d60a

Carlos Martín Nieto 2015-05-29T16:42:40

Merge pull request #3163 from ethomson/emergeconflict Rename GIT_EMERGECONFLICT to GIT_ECONFLICT