Update of /cvsroot/htdocs/ja In directory mogu:/tmp/cvs-serv29183 Log Message: import from TNF. Changes/index.list: 1.699 index.html: 1.815 Status: Vendor Tag: TNF Release Tags: date-2003-01-18 C htdocs/ja/index.html C htdocs/ja/Changes/index.list 2 conflicts created by this import. Use the following command to help the merge: cvs checkout -jTNF:yesterday -jTNF htdocs/ja