comparison hgext/histedit.py @ 26096:b237a68bfea3

histedit: fix grammar for help for safety aborts
author timeless@mozdev.org
date Fri, 28 Aug 2015 11:31:44 -0400
parents 84dcc37b1272
children ce26928cbe41
comparison
equal deleted inserted replaced
26095:6eed95ca4c03 26096:b237a68bfea3
673 673
674 With --outgoing, this edits changesets not found in the 674 With --outgoing, this edits changesets not found in the
675 destination repository. If URL of the destination is omitted, the 675 destination repository. If URL of the destination is omitted, the
676 'default-push' (or 'default') path will be used. 676 'default-push' (or 'default') path will be used.
677 677
678 For safety, this command is aborted, also if there are ambiguous 678 For safety, this command is also aborted if there are ambiguous
679 outgoing revisions which may confuse users: for example, there are 679 outgoing revisions which may confuse users: for example, if there
680 multiple branches containing outgoing revisions. 680 are multiple branches containing outgoing revisions.
681 681
682 Use "min(outgoing() and ::.)" or similar revset specification 682 Use "min(outgoing() and ::.)" or similar revset specification
683 instead of --outgoing to specify edit target revision exactly in 683 instead of --outgoing to specify edit target revision exactly in
684 such ambiguous situation. See :hg:`help revsets` for detail about 684 such ambiguous situation. See :hg:`help revsets` for detail about
685 selecting revisions. 685 selecting revisions.