diff deploy/linux/control @ 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 212093882e4a
children 21e4df9865af
line wrap: on
line diff