Mercurial Mercurial > pub > hg > evolve / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgext3rd/evolve/evolvecmd.py
changeset 3741 ec460882eab7
parent 3740 07e246deb612
child 3742 d577cef1f044 
--- a/hgext3rd/evolve/evolvecmd.py	Sun Apr 29 19:14:41 2018 +0530
+++ b/hgext3rd/evolve/evolvecmd.py	Sun Apr 29 19:18:54 2018 +0530
@@ -405,7 +405,8 @@
         repo.ui.status(_("updating to \"local\" side of the conflict: %s\n") %
                        divergent.hex()[:12])
         hg.updaterepo(repo, divergent.node(), False)
-    repo.ui.note(_('merging %s changeset\n') % TROUBLES['CONTENTDIVERGENT'])
+    repo.ui.status(_("merging \"other\" %s changeset '%s'\n") %
+                   (TROUBLES['CONTENTDIVERGENT'], other.hex()[:12]))
     if progresscb:
         progresscb()
     stats = merge.update(repo,
evolve