diff easyhg.pro @ 159:087d7cdde662

* Add InConflict state (not yet used)
author Chris Cannam
date Fri, 03 Dec 2010 12:29:57 +0000
parents edab92f3ea0b
children b6dd1ee0e486
line wrap: on
line diff