method private resolve_conflicts selection () =
match selection with
[] -> ()
| file :: _ ->
let f () =
match file.Ocvs_types.cvs_status with
Ocvs_types.Conflicts_on_merge ->
Ocamlcvs.Diffs.manual_merge M.resolve_conflicts file.Ocvs_types.cvs_file
| _ -> ()
in
handle_error f () ()