annotate images/browser-64.png @ 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 6d5a5571caec
children
rev   line source
Chris@69 1 (binary:image/png)