(* COCANWIKI - a wiki written in Objective CAML.
* Written by Richard W.M. Jones <rich@merjis.com>.
* Copyright (C) 2004 Merjis Ltd.
- * $Id: edit.ml,v 1.33 2006/08/01 14:50:47 rich Exp $
+ * $Id: edit.ml,v 1.34 2006/08/04 12:20:06 rich Exp $
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
(* Synthesize our own changes. *)
let old_page = get_version_for_diff dbh old_version in
let new_page =
- page_for_diff css (List.map (
- fun (sectionname, _, _, content) ->
- let sectionname = match sectionname with
- | None -> ""
- | Some s -> s in
- sectionname, content
- ) model.contents_) in
+ page_for_diff model css in
let our_diff = diff_cmd old_page new_page in
(* Fill out the conflict template. *)