Mercurial > hg > mercurial-crew-with-dirclash
diff doc/hgmerge.1.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 | 3ab6e55ee361 |
children | 345bac2bc4ec |