annotate easyhg.rc @ 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 2afac743acdf
children ca943d514769
rev   line source
Chris@197 1 IDI_ICON1 ICON DISCARDABLE "easyhg-icon.ico"