Mercurial > hg > easyhg

diff hgaction.h @ 163:5c262ac73948

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* First cut of work on merge/resolve logic
author Chris Cannam
date Fri, 03 Dec 2010 19:35:04 +0000
parents 910c2c5d1873
children 4bad3c5c053a
line wrap: on
line diff
--- a/hgaction.h	Fri Dec 03 14:43:32 2010 +0000
+++ b/hgaction.h	Fri Dec 03 19:35:04 2010 +0000
@@ -27,6 +27,7 @@
     ACT_QUERY_PATHS,
     ACT_QUERY_BRANCH,
     ACT_STAT,
+    ACT_RESOLVE_LIST,
     ACT_QUERY_HEADS,
     ACT_QUERY_PARENTS,
     ACT_LOG,
@@ -45,7 +46,6 @@
     ACT_UPDATE,
     ACT_REVERT,
     ACT_MERGE,
-    ACT_RESOLVE_LIST,
     ACT_SERVE,
     ACT_RESOLVE_MARK,
     ACT_RETRY_MERGE,