Commit 635c235cf320428775529285bebf6f238fc71184

nulltoken 2013-01-10T12:11:49

errors: Introduce EMERGECONFLICT error code