Mercurial > hg
diff tests/test-update-branches.t @ 34920:6a0e1d593bdd stable
commands: be more uniform in an "hg update" error message
"can only specify one of -C/--clean, -c/--check, or -m/merge"
becomes
"can only specify one of -C/--clean, -c/--check, or -m/--merge"
author | muxator <a.mux@inwind.it> |
---|---|
date | Mon, 23 Oct 2017 22:45:24 +0200 |
parents | 1644623ab096 |
children | 02fdb8c018aa |
line wrap: on
line diff
--- a/tests/test-update-branches.t Wed Oct 04 23:22:34 2017 +0200 +++ b/tests/test-update-branches.t Mon Oct 23 22:45:24 2017 +0200 @@ -184,17 +184,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: can only specify one of -C/--clean, -c/--check, or -m/--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: can only specify one of -C/--clean, -c/--check, or -m/--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: can only specify one of -C/--clean, -c/--check, or -m/--merge parent=1 M foo