comparison src/mainwindow.h @ 530:2262f753b19e

Add more useful message for merge with working directory ancestor
author Chris Cannam
date Wed, 23 Nov 2011 11:24:23 +0000
parents a17c06f773cd
children a4e699d32a9a
comparison
equal deleted inserted replaced
529:4276c7923d65 530:2262f753b19e