Mercurial > hg
diff tests/test-update-branches.t @ 44411:1e508097f570
update: simplify slightly
Differential Revision: https://phab.mercurial-scm.org/D8204
author | Valentin Gatien-Baron <vgatien-baron@janestreet.com> |
---|---|
date | Mon, 02 Mar 2020 15:34:51 -0500 |
parents | f935b680860d |
children | 6a34e438461b |
line wrap: on
line diff
--- a/tests/test-update-branches.t Sun Mar 01 21:16:45 2020 -0500 +++ b/tests/test-update-branches.t Mon Mar 02 15:34:51 2020 -0500 @@ -189,17 +189,17 @@ parent=2 $ revtest '-cC dirty linear' dirty 1 2 -cC - abort: can only specify one of -C/--clean, -c/--check, or -m/--merge + abort: cannot specify both --clean and --check parent=1 M foo $ revtest '-mc dirty linear' dirty 1 2 -mc - abort: can only specify one of -C/--clean, -c/--check, or -m/--merge + abort: cannot specify both --check and --merge parent=1 M foo $ revtest '-mC dirty linear' dirty 1 2 -mC - abort: can only specify one of -C/--clean, -c/--check, or -m/--merge + abort: cannot specify both --clean and --merge parent=1 M foo