diff deploy/osx/combine.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 aa852b477e4d
children
line wrap: on
line diff