diff doc/ja/hgmerge.1.ja.txt @ 1809:ef53d200df3d

Updated test-commit to match changed output caused by nested transactions.
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 28 Feb 2006 23:19:47 +0100
parents 874efc57e00a
children 345bac2bc4ec
line wrap: on
line diff