Mercurial > hg > easyhg

diff filestates.h @ 161:5b2046f67a56

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Start using trivial new easyhg extension (requires PyQt)
author Chris Cannam
date Fri, 03 Dec 2010 13:36:53 +0000
parents 087d7cdde662
children 5c262ac73948
line wrap: on
line diff
--- a/filestates.h	Fri Dec 03 12:32:59 2010 +0000
+++ b/filestates.h	Fri Dec 03 13:36:53 2010 +0000
@@ -35,7 +35,7 @@
         Unknown,
         Removed,
         Missing,
-        InConflict
+        InConflict,
 
         FirstState = Clean,
         LastState = InConflict