diff easyhg.py @ 228:b286f26561c9

* Restore a change that got lost in the merge. I think I need to review the external merge tool mechanism here
author Chris Cannam
date Thu, 06 Jan 2011 12:22:56 +0000
parents c5fceb3fe5b4
children 960b782f0a64
line wrap: on
line diff