# HG changeset patch # User Anton Shestakov # Date 1621249822 -28800 # Node ID c04c4383f33e7ca682c3294379e46b141a1afd25 # Parent c1af4d9e46f4fddb0587158eedfe9bcb0fa687b2 evolve: drop quotes around node in a content divergence resolution message diff -r c1af4d9e46f4 -r c04c4383f33e hgext3rd/evolve/evolvecmd.py --- a/hgext3rd/evolve/evolvecmd.py Mon May 17 17:45:57 2021 +0800 +++ b/hgext3rd/evolve/evolvecmd.py Mon May 17 19:10:22 2021 +0800 @@ -574,7 +574,7 @@ local) compat.update(local) # merging the two content-divergent changesets - repo.ui.note(_(b"merging \"other\" %s changeset '%s'\n") % + repo.ui.note(_(b"merging \"other\" %s changeset %s\n") % (TROUBLES['CONTENTDIVERGENT'], other)) if progresscb: progresscb() diff -r c1af4d9e46f4 -r c04c4383f33e tests/test-evolve-content-divergent-basic.t --- a/tests/test-evolve-content-divergent-basic.t Mon May 17 17:45:57 2021 +0800 +++ b/tests/test-evolve-content-divergent-basic.t Mon May 17 19:10:22 2021 +0800 @@ -517,7 +517,7 @@ merge:[3] More addition with: [2] More addition base: [1] More addition - merging "other" content-divergent changeset 'fc6349f931da' + merging "other" content-divergent changeset fc6349f931da resolving manifests merging a 0 files updated, 1 files merged, 0 files removed, 0 files unresolved