diff tests/test-pick.t @ 5317:011b53a9d03c mercurial-4.7

test-compat: merge mercurial-4.8 into mercurial-4.7
author Anton Shestakov <av6@dwimlabs.net>
date Fri, 08 May 2020 22:18:15 +0800
parents 9f69164cdc16 e6e92835d42d
children 82da27321e91
line wrap: on
line diff
--- a/tests/test-pick.t	Fri May 08 20:36:32 2020 +0800
+++ b/tests/test-pick.t	Fri May 08 22:18:15 2020 +0800
@@ -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)