- added support for conflicted/replaced files

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@6642 20353a03-c40f-0410-a6d1-a30d3c3de9de

- added support for conflicted/replaced files
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@6642 20353a03-c40f-0410-a6d1-a30d3c3de9de
79b53a01 · Christophe Dumez · d02f2044 · 79b53a01
Commit 79b53a01 authored Apr 14, 2006 by Christophe Dumez
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 1 deletion

bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml .../portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml +2 -1

No files found.
--- a/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml
+++ b/bt5/erp5_forge/SkinTemplateItem/portal_skins/erp5_svn/BusinessTemplate_viewSvnStatus.xml
@@ -125,7 +125,8 @@ here/BusinessTemplate_doCreateJavaScriptStatus">javascript here</tal:js>\n
                <tr><td>  </td></tr>\n
                <tr><td><font color="green" size="1">Added File</font></td></tr>\n
                <tr><td><font color="orange" size="1">Modified File</font></td></tr>\n
-                <tr><td><font color="red" size="1">Deleted File</font></td></tr></table>\n
+                <tr><td><font color="red" size="1">Deleted File</font></td></tr>\n
+                <tr><td><font color="grey" size="1">Conflicted File</font></td></tr></table>\n
                <br><br>\n
                </td>\n
 \t</tr>\n