Mercurial > hg

diff tests/test-globalopts.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 0750f11152fe
children f60730693efc
line wrap: on
line diff
--- a/tests/test-globalopts.out	Fri Apr 11 12:04:26 2008 +0200
+++ b/tests/test-globalopts.out	Fri Apr 11 12:52:56 2008 -0500
@@ -183,6 +183,7 @@
  recover      roll back an interrupted transaction
  remove       remove the specified files on the next commit
  rename       rename files; equivalent of copy + remove
+ resolve      resolve file merges from a branch merge or update
  revert       restore individual files or dirs to an earlier state
  rollback     roll back the last transaction
  root         print the root (top) of the current working dir
@@ -236,6 +237,7 @@
  recover      roll back an interrupted transaction
  remove       remove the specified files on the next commit
  rename       rename files; equivalent of copy + remove
+ resolve      resolve file merges from a branch merge or update
  revert       restore individual files or dirs to an earlier state
  rollback     roll back the last transaction
  root         print the root (top) of the current working dir