Class Odiff_merge.window


class window : title:string -> file:string -> t list -> object .. end

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