comparison doc/ja/hgmerge.1.ja.txt @ 4209:dbc3846c09a1

Merge with -stable, fix small test failure
author Matt Mackall <mpm@selenic.com>
date Wed, 14 Mar 2007 01:26:09 -0500
parents 345bac2bc4ec
children 63b9d2deed48
comparison
equal deleted inserted replaced
4203:bd9b84b9a84b 4209:dbc3846c09a1