Update of /cvsroot/htdocs/ja In directory mogu:/home/soda/work/import Log Message: imported new revision of original. Status: Vendor Tag: TNF Release Tags: date-1999-05-13 C htdocs/ja/index.html 1 conflicts created by this import. Use the following command to help the merge: cvs checkout -jTNF:yesterday -jTNF htdocs/ja