comparison easyhg.rc @ 159:087d7cdde662

* Add InConflict state (not yet used)
author Chris Cannam
date Fri, 03 Dec 2010 12:29:57 +0000
parents d575a8f76a53
children 2afac743acdf
comparison
equal deleted inserted replaced
158:006630304b69 159:087d7cdde662