Mercurial > hg > easyhg
comparison filestates.h @ 161:5b2046f67a56
* Start using trivial new easyhg extension (requires PyQt)
author | Chris Cannam |
---|---|
date | Fri, 03 Dec 2010 13:36:53 +0000 |
parents | 087d7cdde662 |
children | 5c262ac73948 |
comparison
equal
deleted
inserted
replaced
160:98fa31128e9d | 161:5b2046f67a56 |
---|---|
33 Modified, | 33 Modified, |
34 Added, | 34 Added, |
35 Unknown, | 35 Unknown, |
36 Removed, | 36 Removed, |
37 Missing, | 37 Missing, |
38 InConflict | 38 InConflict, |
39 | 39 |
40 FirstState = Clean, | 40 FirstState = Clean, |
41 LastState = InConflict | 41 LastState = InConflict |
42 }; | 42 }; |
43 | 43 |