Mercurial > hg > easyhg

diff filestates.cpp @ 328:ea62eb083ed4 filelist_right_button_menu

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge fixes: primarily, handle failed merges better
author Chris Cannam
date Fri, 11 Mar 2011 18:08:22 +0000
parents 6e1fdda1dff2
children 4cd753e083cc
line wrap: on
line diff
--- a/filestates.cpp	Fri Mar 11 17:42:12 2011 +0000
+++ b/filestates.cpp	Fri Mar 11 18:08:22 2011 +0000
@@ -156,7 +156,7 @@
         break;
 
     case InConflict:
-        a << Annotate << Diff << RedoMerge << Revert << MarkResolved;
+        a << Annotate << Diff << RedoMerge << MarkResolved << Revert;
         break;
 
     case Missing:
@@ -168,7 +168,7 @@
         break;
 
     case Clean:
-        a << Remove << Annotate;
+        a << Annotate << Remove;
         break;
 
     case Ignored: