diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-03-19 20:34:59 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-03-19 20:34:59 +0000 |
| commit | 6b6fd778c7b35961736e9087f56e3872f6d9bdc9 (patch) | |
| tree | b1102d61b413a81b0705418e35b9c3ecf8c37540 /templates/editpage.tmpl | |
| parent | 4d50e71d3117b515bf53cc4af8da6dbf75dcaca8 (diff) | |
| download | ikiwiki-6b6fd778c7b35961736e9087f56e3872f6d9bdc9.tar ikiwiki-6b6fd778c7b35961736e9087f56e3872f6d9bdc9.tar.gz | |
conflict detection, merging, etc should be done now, I think
Diffstat (limited to 'templates/editpage.tmpl')
| -rw-r--r-- | templates/editpage.tmpl | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/templates/editpage.tmpl b/templates/editpage.tmpl index 6aa9ecd1c..6ab988261 100644 --- a/templates/editpage.tmpl +++ b/templates/editpage.tmpl @@ -4,6 +4,8 @@ <TMPL_IF NAME="PAGE_CONFLICT"> <p> <b>Your changes confict with other changes made to the page.</b> +</p> +<p> Conflict markers have been inserted into the page content. Reconcile the confict and commit again to save your changes. </p> @@ -12,6 +14,7 @@ confict and commit again to save your changes. <h1><TMPL_VAR INDEXLINK>/ <TMPL_VAR FORM-TITLE></h1> <TMPL_VAR FIELD-DO> <TMPL_VAR FIELD-FROM> +<TMPL_VAR FIELD-RCSINFO> <TMPL_IF NAME="PAGE_SELECT"> Page location: <TMPL_VAR FIELD-PAGE><br> <TMPL_ELSE> |