module Odiff_merge:Assisting the user to resolve merge conlicts.sig
..end
type
t =
| |
No_conflict of |
| |
Conflict of |
val arrow : string array
val arrow_pix : unit -> GMisc.image
val string_of_file : string -> string
val build_info : string -> t list
class window :title:string -> file:string -> t list ->
object
..end