Mercurial > public > mercurial-scm > hg
diff tests/test-completion.t @ 39392:5d00e6061ba2
resolve: add a flag for the default behavior of re-merging
On its own, it's not useful, but the next commit will add an hgrc
config option to make it mandatory.
There is no short option, as -r almost always means --rev and this
option doesn't seem like it would be so common as to mandate a short
option.
Differential Revision: https://phab.mercurial-scm.org/D4378
| author | Valentin Gatien-Baron <valentin.gatienbaron@gmail.com> |
|---|---|
| date | Sun, 26 Aug 2018 15:52:34 -0400 |
| parents | 828a45233036 |
| children | b05b4b91de3d |
line wrap: on
line diff
--- a/tests/test-completion.t Sat Sep 01 02:01:55 2018 -0400 +++ b/tests/test-completion.t Sun Aug 26 15:52:34 2018 -0400 @@ -331,7 +331,7 @@ phase: public, draft, secret, force, rev recover: rename: after, force, include, exclude, dry-run - resolve: all, list, mark, unmark, no-status, tool, include, exclude, template + resolve: all, list, mark, unmark, no-status, re-merge, tool, include, exclude, template revert: all, date, rev, no-backup, interactive, include, exclude, dry-run rollback: dry-run, force root: