diff easyhg-merge.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 d63711ff6740
children 5f04fa848f34
line wrap: on
line diff