Commit 3f4437e714874ed10ce20fb32ca2dad3ca6f80ee

Vicent Martí 2013-01-11T10:59:31

Merge pull request #1227 from nulltoken/topic/emergeconflict Introduce EMERGECONFLICT