Mercurial > evolve
diff tests/test-pick.t @ 6006:90af9db93d2b mercurial-4.7
test-compat: merge mercurial-4.8 into mercurial-4.7
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 12 Aug 2021 22:01:14 +0200 |
| parents | 82da27321e91 |
| children | 55e9987b8384 |
line wrap: on
line diff
--- a/tests/test-pick.t Thu Aug 12 22:01:11 2021 +0200 +++ b/tests/test-pick.t Thu Aug 12 22:01:14 2021 +0200 @@ -33,10 +33,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)