method cvs_resolve_conflicts =
match self#selection with
[] -> ()
| t :: _ ->
let file = behav#cvs_info_of_t t in
match file.Ocvs_types.cvs_status with
Ocvs_types.Conflicts_on_merge ->
(
try
let info = Odiff_merge.build_info file.Ocvs_types.cvs_file in
ignore (new Odiff_merge.window "test" file.Ocvs_types.cvs_file info)
with Failure s ->
GToolbox.message_box Ocvs_messages.error s
)
| _ -> ()