comparison doc/hgmerge.1.txt @ 2215:afc9a3a43013

revert: remove word "modified" from description.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Fri, 05 May 2006 11:07:29 -0700
parents 3ab6e55ee361
children 345bac2bc4ec
comparison
equal deleted inserted replaced
2214:6c6c0e5595a2 2215:afc9a3a43013