kubota www.debian.or.jp/devel/www WebTranslation.html Sun Jul 8 14:49:11 JST 2001 Update of /var/cvs/www.debian.or.jp/devel/www In directory hp:/tmp/cvs-serv9269 Modified Files: WebTranslation.html Log Message: Explanation on when merge conflict occurs for "cvs -j debian-org".