# HG changeset patch
# User Martin Geisler <mg@lazybytes.net>
# Date 2009-05-14 15:28:26
# Node ID dbc28d362e79a5afe14747761d82c1471ad980f3
# Parent  50b6af595e0c70e1ad97125413f5ffaac6abc306

test-debugcomplete: add --show merge option to output

diff --git a/tests/test-debugcomplete.out b/tests/test-debugcomplete.out
--- a/tests/test-debugcomplete.out
+++ b/tests/test-debugcomplete.out
@@ -169,7 +169,7 @@ diff: rev, change, text, git, nodates, s
 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