method resolve_next =
self#grey_lines ;
match remain with
[] -> ()
| (No_conflict s) :: q ->
Buffer.add_string resolved s ;
wview_1#buffer#insert s;
remain <- q;
self#resolve_next
| (Conflict (s1, s2)) :: q ->
current_conflict <- Some (s1, s2);
wb_validate#misc#set_sensitive true ;
wb_skip#misc#set_sensitive true ;
wview#set_editable true