remove the gpg stuff from hgeditor (superseded by the signing extension)
remove the gpg stuff from hgeditor, update the comments to make it clear
it can be used to show a diff while commiting
merge: warning: conflicts during mergemerging amerging a failed!32e80765d7fe+75234512624c+ tipsomething else=======somethingM a