diff deploy/osx/deploy.sh @ 603:10ef94e51f44

Make sure we update the view after a failed merge
author Chris Cannam
date Tue, 03 Jul 2012 10:08:44 +0100
parents 5ac4e821ee7b
children 0f3e086066fc
line wrap: on
line diff