Added "Conflicted" file state

FossilOrigin-Name: 9d073dbbd5ca3382a184e8693107a01d1c72a754
2014-07-28 12:50:34 +00:00
parent a18be8ddbf
commit 19c4b1ef0d
4 changed files with 14 additions and 10 deletions
--- a/src/MainWindow.h
+++ b/src/MainWindow.h
@ -32,7 +32,8 @@ struct RepoFile
 		TYPE_DELETED		= 1<<4,
 		TYPE_MISSING		= 1<<5,
 		TYPE_RENAMED		= 1<<6,
-		TYPE_MODIFIED		= TYPE_EDITTED|TYPE_ADDED|TYPE_DELETED|TYPE_MISSING|TYPE_RENAMED,
+		TYPE_CONFLICTED		= 1<<7,
+		TYPE_MODIFIED		= TYPE_EDITTED|TYPE_ADDED|TYPE_DELETED|TYPE_MISSING|TYPE_RENAMED|TYPE_CONFLICTED,
 		TYPE_REPO			= TYPE_UNCHANGED|TYPE_MODIFIED,
 		TYPE_ALL			= TYPE_UNKNOWN|TYPE_REPO
 	};