branch | stable |
changeset 4507 | de9089514833 |
parent 4491 | bdaf34903430 |
child 4512 | 7a779a288793 |
child 4686 | f1466f5ffbf5 |
--- a/tests/test-pick.t Wed Apr 10 16:11:59 2019 +0200 +++ b/tests/test-pick.t Thu Apr 11 22:13:55 2019 +0200 @@ -24,9 +24,10 @@ options: - -r --rev REV revision to pick - -c --continue continue interrupted pick - -a --abort abort interrupted pick + -r --rev REV revision to pick + -c --continue continue interrupted pick + -a --abort abort interrupted pick + -t --tool TOOL specify merge tool (some details hidden, use --verbose to show complete help)