diff deploy/osx/Info.plist @ 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 960b782f0a64
children 0d89746bae1a
line wrap: on
line diff