From d76c10cba24c2bea026facb2a9e5e3215d7f3994 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 22 Jul 2008 19:58:34 -0400
Subject: Split out error messages from editpage.tmpl into several separate
 templates.

---
 templates/editconflict.tmpl | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 templates/editconflict.tmpl

(limited to 'templates/editconflict.tmpl')

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>
-- 
cgit v1.2.3