Module Odiff_merge (.ml)

module Odiff_merge: sig .. end

Assisting the user to resolve merge conlicts.

type t =

`\|`	`No_conflict of string`
`\|`	`Conflict of (string * string)`

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