diff hg @ 78:85f1f87dc8ff

Add "HG: merge resolve" to editor text for merge
author mpm@selenic.com
date Tue, 17 May 2005 01:07:57 -0800
parents 401e18c95ad3
children 837d473d54d5
line wrap: on
line diff