comparison src/filestatuswidget.cpp @ 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 896b7903e8f2
children 7829da6abe97
comparison
equal deleted inserted replaced
529:4276c7923d65 530:2262f753b19e