turn on syslog for the svn post-commit hook

[ikiwiki.git] / templates / editpage.tmpl

diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl
index 15a4069c00325000cd913bb2cf784e4cc8df7f95..02951210ffaad64a6ebcae54cccd685389c6e32b 100644 (file)
--- a/templates/editpage.tmpl
+++ b/templates/editpage.tmpl
@@ -42,6 +42,17 @@ Perhaps someone else has deleted it or moved it. If you want to recreate
 this page with your text, click "Save Page" again.
 </p>
 </TMPL_IF>
+<TMPL_IF NAME="CREATION_CONFLICT">
+<p>
+<b>While you were creating this page, someone else independently created a page
+with the same name.</b>
+</p>
+<p>
+The edit box below contains the page's current content, followed by the 
+content you entered previously, to allow you to merge the two
+together before saving.
+</p>
+</TMPL_IF>
 <TMPL_VAR FORM-START>
 <div class="header">
 <span><TMPL_VAR INDEXLINK>/ <TMPL_VAR FORM-TITLE></span>