diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-03-19 19:09:57 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-03-19 19:09:57 +0000 |
| commit | 3c239b14bc84e33535cb8980fcdcf8ab5d1022eb (patch) | |
| tree | bd46644a5b284d567f403ba83de1a8b2e013cdb1 /templates | |
| parent | c7e9c3692622d8f568cf300189dfe15ff5113717 (diff) | |
| download | ikiwiki-3c239b14bc84e33535cb8980fcdcf8ab5d1022eb.tar ikiwiki-3c239b14bc84e33535cb8980fcdcf8ab5d1022eb.tar.gz | |
first cut at svn merge and conflict
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/editpage.tmpl | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index d02eaad70..6aa9ecd1c 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -1,6 +1,13 @@ <html> <head><title><TMPL_VAR FORM-TITLE></title></head> <body> +<TMPL_IF NAME="PAGE_CONFLICT"> +<p> +<b>Your changes confict with other changes made to the page.</b> +Conflict markers have been inserted into the page content. Reconcile the +confict and commit again to save your changes. +</p> +</TMPL_IF> <TMPL_VAR FORM-START> <h1><TMPL_VAR INDEXLINK>/ <TMPL_VAR FORM-TITLE></h1> <TMPL_VAR FIELD-DO> |