Mercurial > public > mercurial-scm > hg-stable

diff tests/test-debugcomplete.t @ 12810:a68ccfd9c7be stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
backout: add --tool argument for specifying merge tool
author Steve Borho <steve@borho.org>
date Fri, 22 Oct 2010 11:58:43 -0500
parents 05bd2658bbb3
children 15ca4bfecfe3
line wrap: on
line diff
--- a/tests/test-debugcomplete.t	Fri Oct 22 17:08:15 2010 +0200
+++ b/tests/test-debugcomplete.t	Fri Oct 22 11:58:43 2010 -0500
@@ -196,7 +196,7 @@
   update: clean, check, date, rev
   addremove: similarity, include, exclude, dry-run
   archive: no-decode, prefix, rev, type, subrepos, include, exclude
-  backout: merge, parent, rev, include, exclude, message, logfile, date, user
+  backout: merge, parent, tool, rev, include, exclude, message, logfile, date, user
   bisect: reset, good, bad, skip, command, noupdate
   branch: force, clean
   branches: active, closed