Mercurial > hg > mercurial-crew-with-dirclash
diff doc/ja/hgmerge.1.ja.txt @ 2139:74f70f2e08aa
Fixed test output for not using the deprecated 'hg forget'.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Thu, 27 Apr 2006 13:05:02 +0200 |
parents | 874efc57e00a |
children | 345bac2bc4ec |