X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/3c239b14bc84e33535cb8980fcdcf8ab5d1022eb..2469114dc567fb3a52609b589d85eb28af0cd670:/templates/editpage.tmpl?ds=sidebyside diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 6aa9ecd1c..4724cd65f 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,9 +1,20 @@ + -
Your changes confict with other changes made to the page. +
+Conflict markers have been inserted into the page content. Reconcile the confict and commit again to save your changes.
@@ -12,22 +23,29 @@ confict and commit again to save your changes.