Mercurial > hg

changeset 8388:dbc28d362e79

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-debugcomplete: add --show merge option to output
author Martin Geisler <mg@lazybytes.net>
date Thu, 14 May 2009 17:28:26 +0200
parents 50b6af595e0c
children 4b798b100c32
files tests/test-debugcomplete.out
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-debugcomplete.out	Thu May 14 16:03:17 2009 +0200
+++ b/tests/test-debugcomplete.out	Thu May 14 17:28:26 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
+merge: force, rev, show
 parents: rev, style, template
 pull: update, force, rev, ssh, remotecmd
 push: force, rev, ssh, remotecmd