sig
class type diffs_window =
object
method diffs : Odiff.diff list
method file : string
method window : GWindow.window
end
val diffs_window :
title:string -> file:string -> Odiff.diff list -> Odiff_gtk.diffs_window
class type string_diffs_window =
object
method diffs : Odiff.diff list
method string : string
method window : GWindow.window
end
val string_diffs_window :
title:string ->
string:string -> Odiff.diff list -> Odiff_gtk.string_diffs_window
type merge_info = No_conflict of string | Conflict of (string * string)
val build_merge_info : string -> Odiff_gtk.merge_info list
val manual_merge_window :
title:string -> file:string -> Odiff_gtk.merge_info list -> unit
end