diff doc/ja/hgmerge.1.ja.txt @ 3960:c137e21dba5a

test-manifest-merging: we only need to remove files
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sun, 24 Dec 2006 22:28:01 +0100
parents 345bac2bc4ec
children 63b9d2deed48
line wrap: on
line diff