comparison doc/hgmerge.1.txt @ 2769:2ace3bf43089

tests: fix output for test-backout
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Wed, 02 Aug 2006 13:04:36 -0700
parents 3ab6e55ee361
children 345bac2bc4ec
comparison
equal deleted inserted replaced
2768:b1b1aa6f275c 2769:2ace3bf43089