comparison doc/hgmerge.1.txt @ 1231:effff847870f

CONTRIBUTORS update
author mpm@selenic.com
date Fri, 09 Sep 2005 12:19:24 -0700
parents c084cfbb2389
children 3ab6e55ee361
comparison
equal deleted inserted replaced
1230:6eac821c202c 1231:effff847870f