Mercurial > public > mercurial-scm > hg-stable
diff tests/test-debugcomplete.t @ 13366:c756e9166417
bookmarks: merge incoming/outgoing into core
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Thu, 10 Feb 2011 13:46:28 -0600 |
parents | a939f08fae9c |
children | d4ab9486e514 |
line wrap: on
line diff
--- a/tests/test-debugcomplete.t Thu Feb 10 13:46:28 2011 -0600 +++ b/tests/test-debugcomplete.t Thu Feb 10 13:46:28 2011 -0600 @@ -228,10 +228,10 @@ help: identify: rev, num, id, branch, tags import: strip, base, force, no-commit, exact, import-branch, message, logfile, date, user, similarity - incoming: force, newest-first, bundle, rev, branch, patch, git, limit, no-merges, stat, style, template, ssh, remotecmd, insecure, subrepos + incoming: force, newest-first, bundle, rev, bookmarks, branch, patch, git, limit, no-merges, stat, style, template, ssh, remotecmd, insecure, subrepos locate: rev, print0, fullpath, include, exclude manifest: rev - outgoing: force, rev, newest-first, branch, patch, git, limit, no-merges, stat, style, template, ssh, remotecmd, insecure, subrepos + outgoing: force, rev, newest-first, bookmarks, branch, patch, git, limit, no-merges, stat, style, template, ssh, remotecmd, insecure, subrepos parents: rev, style, template paths: recover: