log mainwindow.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 14:43:32 +0000 Chris Cannam * Better handling of empty repositories; some tidying & textual fixes
Thu, 02 Dec 2010 21:52:24 +0000 Chris Cannam * Default merge comments