First test for wrong merge green
found how to get the right exception from hgapi!
Merge branch 'master' of https://github.com/Teleopti/MercurialExtensions
fixing indentation to fix build!