comparison filestates.h @ 163:5c262ac73948

* First cut of work on merge/resolve logic

 public:
     FileStates();
 
     enum State {
 
-        Clean,
+        // These are in the order in which they want to be listed in
+        // the interface
+
         Modified,
         Added,
+        Removed,
+        InConflict,
+        Missing,
+        Clean,
         Unknown,
-        Removed,
-        Missing,
-        InConflict,
 
-        FirstState = Clean,
-        LastState = InConflict
+        FirstState = Modified,
+        LastState = Unknown
     };
 
     void parseStates(QString text);
 
     void clearBuckets();