diff comparison.txt @ 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 2ab801e0ea9f
children 17e66e1a0382
line wrap: on
line diff