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
Thu, 17 Nov 2011 17:38:18 +0000 Chris Cannam Fix to prior commit
Thu, 17 Nov 2011 17:35:02 +0000 Chris Cannam Grab server port from hgrc if present