summaryrefslogtreecommitdiff
path: root/templates/editconflict.tmpl
diff options
context:
space:
mode:
Diffstat (limited to 'templates/editconflict.tmpl')
-rw-r--r--templates/editconflict.tmpl7
1 files changed, 7 insertions, 0 deletions
diff --git a/templates/editconflict.tmpl b/templates/editconflict.tmpl
new file mode 100644
index 000000000..125203395
--- /dev/null
+++ b/templates/editconflict.tmpl
@@ -0,0 +1,7 @@
+<p class="error">
+<b>Your changes conflict with other changes made to the page.</b>
+</p>
+<p>
+Conflict markers have been inserted into the page content. Reconcile the
+conflict and commit again to save your changes.
+</p>