Mercurial > evolve

diff tests/test-grab.t @ 4391:054ff759f2fd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
pick: add --tool for hg pick to specify mergetool This patch used configuration override to enable you to pass a mergetool via the --tool flag in case there is any merge conflict.
author Sangeet Kumar Mishra <mail2sangeetmishra@gmail.com>
date Sun, 03 Feb 2019 17:03:02 +0530
parents 424b498aac00
children
line wrap: on
line diff
--- a/tests/test-grab.t	Wed Feb 06 13:49:29 2019 +0800
+++ b/tests/test-grab.t	Sun Feb 03 17:03:02 2019 +0530
@@ -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)