Merging differences

Sunday, Aug 31, 2008

:help merge


do
dp

VIMdiff is an amazing too for merging.