view images/star.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 ef31a55c86b6
children
line wrap: on
line source
(binary:image/png)