log filestates.cpp @ 163:5c262ac73948

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 12:29:57 +0000 Chris Cannam * Add InConflict state (not yet used)