diff deploy/osx/deploy.sh @ 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 cd3dd285d0ff
children 5ac4e821ee7b
line wrap: on
line diff