--- a/mercurial/merge.py Wed Dec 07 11:22:57 2011 -0600
+++ b/mercurial/merge.py Wed Dec 07 11:23:01 2011 -0600
@@ -519,11 +519,12 @@
" has no effect"))
elif pa == p1:
if p1.branch() == p2.branch():
- raise util.Abort(_("nothing to merge (use 'hg update'"
- " or check 'hg heads')"))
+ raise util.Abort(_("nothing to merge"),
+ hint=_("use 'hg update' "
+ "or check 'hg heads'"))
if not force and (wc.files() or wc.deleted()):
- raise util.Abort(_("outstanding uncommitted changes "
- "(use 'hg status' to list changes)"))
+ raise util.Abort(_("outstanding uncommitted changes"),
+ hint=_("use 'hg status' to list changes"))
for s in wc.substate:
if wc.sub(s).dirty():
raise util.Abort(_("outstanding uncommitted changes in "