struct
type diffs = Odiff.diffs
let display_diffs ?on_close ~title ~file diffs =
let w = Odiff_gui.diffs_window ~title ~file diffs in
(match on_close with
None -> ()
| Some f -> ignore (w#window#connect#destroy f)
);
w#window#show ()
let manual_merge ~title ~file =
let info = Odiff_gui.build_merge_info file in
Odiff_gui.manual_merge_window ~title ~file info
end