Mercurial > public > mercurial-scm > hg

diff tests/test-debugcomplete.out @ 6518:92ccccb55ba3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: new command - add basic resolve command functionality - point failed update and merge at resolve
author Matt Mackall <mpm@selenic.com>
date Fri, 11 Apr 2008 12:52:56 -0500
parents bd34f0ac3cb0
children 7ca2be800804
line wrap: on
line diff
--- a/tests/test-debugcomplete.out	Fri Apr 11 12:04:26 2008 +0200
+++ b/tests/test-debugcomplete.out	Fri Apr 11 12:52:56 2008 -0500
@@ -33,6 +33,7 @@
 recover
 remove
 rename
+resolve
 revert
 rollback
 root
@@ -79,6 +80,7 @@
 recover
 remove
 rename
+resolve
 revert
 rollback
 root