diff deploy/osx/deploy.sh @ 505:1c05e7576ea5

Fix bug #292: "Merge that results in no changes leaves interface in inconsistent state." Show uncommitted state whenever a merge is present, even if no file changes
author Chris Cannam
date Mon, 17 Oct 2011 16:25:02 +0100
parents cd3dd285d0ff
children 5ac4e821ee7b
line wrap: on
line diff