--- 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