X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/072967e62a06936dd082f02ae5d8fd6103f2e16c..9205e0ff82b511a2759530c1e2597eaafd3cf488:/templates/editpage.tmpl diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 15a4069c0..7f6c2a97a 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,17 +1,5 @@ - - -
-Your changes conflict with other changes made to the page. @@ -42,11 +30,20 @@ Perhaps someone else has deleted it or moved it. If you want to recreate this page with your text, click "Save Page" again.
+While you were creating this page, someone else independently created a page +with the same name. +
++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. +
+