Mercurial > hg > mercurial-crew-with-dirclash
diff doc/ja/hgmerge.1.ja.txt @ 5217:551958d5082c
testcase for issue705 (fixed by 316ce5e85b3e)
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Fri, 24 Aug 2007 00:52:28 +0200 |
parents | 63b9d2deed48 |
children |