view easyhg.rc @ 163:5c262ac73948

* First cut of work on merge/resolve logic
author Chris Cannam
date Fri, 03 Dec 2010 19:35:04 +0000
parents d575a8f76a53
children 2afac743acdf
line wrap: on
line source
IDI_ICON1 ICON DISCARDABLE "hgexplorer.ico"