diff hgaction.h @ 312:f98c8ece3035

Merge from branch "new-branches-with-status-outside-tabs"
author Chris Cannam
date Tue, 01 Mar 2011 14:22:53 +0000
parents 5b4aa1c24407
children 4cd753e083cc
line wrap: on
line diff
--- a/hgaction.h	Mon Feb 28 17:35:55 2011 +0000
+++ b/hgaction.h	Tue Mar 01 14:22:53 2011 +0000
@@ -54,6 +54,7 @@
     ACT_RESOLVE_MARK,
     ACT_RETRY_MERGE,
     ACT_TAG,
+    ACT_NEW_BRANCH,
     ACT_HG_IGNORE,
 };