Mercurial > hg > easyhg
log filestates.h @ 169:c7fa56707ae9
age | author | description |
---|---|---|
Fri, 03 Dec 2010 19:35:04 +0000 | Chris Cannam | * First cut of work on merge/resolve logic |
Fri, 03 Dec 2010 13:36:53 +0000 | Chris Cannam | * Start using trivial new easyhg extension (requires PyQt) |
Fri, 03 Dec 2010 12:29:57 +0000 | Chris Cannam | * Add InConflict state (not yet used) |