Mercurial > hg > mercurial-crew-with-dirclash
diff doc/ja/hgmerge.1.ja.txt @ 1947:65aff2ed61ae
fix the call to util.matcher (the args should be (reporoot, cwd, ...))
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Mon, 13 Mar 2006 23:32:57 +0100 |
parents | 874efc57e00a |
children | 345bac2bc4ec |