# HG changeset patch # User Martin von Zweigbergk # Date 1477699903 25200 # Node ID 6c78a54705839b34edf638e415939362ee21b8b6 # Parent c9ddc93eee67de7787133c725971e9bc108c3e93 evolve: prefer "abort" over "abandon" in messages for consistency diff -r c9ddc93eee67 -r 6c78a5470583 hgext/evolve.py --- a/hgext/evolve.py Fri Oct 28 15:17:27 2016 -0700 +++ b/hgext/evolve.py Fri Oct 28 17:11:43 2016 -0700 @@ -2148,7 +2148,7 @@ hg._showstats(repo, stats) if stats[3]: repo.ui.status(_("use 'hg resolve' to retry unresolved file merges " - "or 'hg update -C .' to abandon\n")) + "or 'hg update -C .' to abort\n")) if stats[3] > 0: raise error.Abort('merge conflict between several amendments ' '(this is not automated yet)', diff -r c9ddc93eee67 -r 6c78a5470583 tests/test-stabilize-result.t --- a/tests/test-stabilize-result.t Fri Oct 28 15:17:27 2016 -0700 +++ b/tests/test-stabilize-result.t Fri Oct 28 17:11:43 2016 -0700 @@ -359,7 +359,7 @@ merging a warning: conflicts while merging a! (edit, then use 'hg resolve --mark') 0 files updated, 0 files merged, 0 files removed, 1 files unresolved - use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon + use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abort abort: merge conflict between several amendments (this is not automated yet) (/!\ You can try: /!\ * manual merge + resolve => new cset X