svn resolved ./cache

./cache 为冲突文件路径

“cache”的冲突状态已解决

[root@localhost coremail]# svn resolved ./udsvr/unittest/tcase_altpwd_cm26212.cpp

“udsvr/unittest/tcase_altpwd_cm26212.cpp”的冲突状态已解决