branch | mercurial-4.7 |
changeset 4672 | 653c42af172e |
parent 4512 | 7a779a288793 |
child 4516 | f54bb6eaf5e6 |
child 4771 | ac079483153a |
--- a/tests/test-pick.t Wed Jun 05 17:39:32 2019 +0200 +++ b/tests/test-pick.t Wed Jun 05 17:42:50 2019 +0200 @@ -24,10 +24,10 @@ options: - -r --rev REV revision to pick - -c --continue continue interrupted pick - -a --abort abort interrupted pick - -t --tool TOOL specify merge tool + -r --rev REV revision to pick + -c --continue continue interrupted pick + -a --abort abort interrupted pick + -t --tool VALUE specify merge tool (some details hidden, use --verbose to show complete help)