title:string ->
file:string ->
Odiff_merge.t list ->
object
val colors : string * string
val mutable current_conflict : (string * string) option
val mutable lines1 : (int * int) list
val mutable lines2 : (int * int) list
val mutable remain : Odiff_merge.t list
val resolved : Buffer.t
method close : unit -> unit
method grey_lines : unit
method import : (string * string -> string) -> unit -> unit
method insert_string :
?emph:(string * string -> string) -> string GList.clist -> string -> int
method remaining_conflicts : int
method resolve_next : unit
method save : unit -> unit
method save_and_close : unit -> unit
method skip : unit -> unit
method string_of_conflict : string * string -> string
method update_wlists : unit
method validate : unit -> unit
end