Mercurial > public > mercurial-scm > hg

diff tests/test-debugcomplete.out @ 8834:6d36fc70754e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: rename -S/--show option to -P/--preview
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Fri, 19 Jun 2009 13:58:48 +0200
parents 859f841937d0
children f331de880cbb
line wrap: on
line diff
--- a/tests/test-debugcomplete.out	Fri Jun 19 13:58:22 2009 +0200
+++ b/tests/test-debugcomplete.out	Fri Jun 19 13:58:48 2009 +0200
@@ -169,7 +169,7 @@
 export: output, switch-parent, text, git, nodates
 init: ssh, remotecmd
 log: follow, follow-first, date, copies, keyword, rev, removed, only-merges, user, only-branch, prune, patch, git, limit, no-merges, style, template, include, exclude
-merge: force, rev, show
+merge: force, rev, preview
 parents: rev, style, template
 pull: update, force, rev, ssh, remotecmd
 push: force, rev, ssh, remotecmd