log src/mainwindow.cpp @ 530:2262f753b19e

age author description
Wed, 23 Nov 2011 11:24:23 +0000 Chris Cannam Add more useful message for merge with working directory ancestor