Mercurial > public > mercurial-scm > hg-stable
diff tests/test-debugcomplete.t @ 12750:05bd2658bbb3
merge: add --tool argument to merge and resolve
These arguments are shorthand for --config ui.merge, but they also
override HGMERGE if it is found in the user's environment.
| author | Steve Borho <steve@borho.org> |
|---|---|
| date | Fri, 15 Oct 2010 23:00:45 -0500 |
| parents | 92e30e135581 |
| children | a68ccfd9c7be |
line wrap: on
line diff
--- a/tests/test-debugcomplete.t Sun Oct 17 14:00:01 2010 +0300 +++ b/tests/test-debugcomplete.t Fri Oct 15 23:00:45 2010 -0500 @@ -186,7 +186,7 @@ forget: include, exclude init: ssh, remotecmd log: follow, follow-first, date, copies, keyword, rev, removed, only-merges, user, only-branch, branch, prune, patch, git, limit, no-merges, stat, style, template, include, exclude - merge: force, rev, preview + merge: force, tool, rev, preview pull: update, force, rev, branch, ssh, remotecmd push: force, rev, branch, new-branch, ssh, remotecmd remove: after, force, include, exclude @@ -236,7 +236,7 @@ paths: recover: rename: after, force, include, exclude, dry-run - resolve: all, list, mark, unmark, no-status, include, exclude + resolve: all, list, mark, unmark, tool, no-status, include, exclude revert: all, date, rev, no-backup, include, exclude, dry-run rollback: dry-run root: