Mercurial > public > mercurial-scm > hg-stable

diff tests/test-completion.t @ 32296:9bc36198338e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
debugcommands: add debugpickmergetool to examine which merge tool is chosen Before this patch, there is no convenient way to know which merge tool is chosen for each managed files without actual merging.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Sat, 13 May 2017 03:37:50 +0900
parents 2406dbba49bd
children ccef71de7d41
line wrap: on
line diff
--- a/tests/test-completion.t	Sat May 13 03:31:42 2017 +0900
+++ b/tests/test-completion.t	Sat May 13 03:37:50 2017 +0900
@@ -99,6 +99,7 @@
   debugnamecomplete
   debugobsolete
   debugpathcomplete
+  debugpickmergetool
   debugpushkey
   debugpvec
   debugrebuilddirstate
@@ -272,6 +273,7 @@
   debugnamecomplete: 
   debugobsolete: flags, record-parents, rev, index, delete, date, user, template
   debugpathcomplete: full, normal, added, removed
+  debugpickmergetool: rev, changedelete, include, exclude, tool
   debugpushkey: 
   debugpvec: 
   debugrebuilddirstate: rev, minimal