Merging differences

Published: Sunday, Aug 31, 2008 Last modified: Saturday, Jan 1, 2022

:help merge


do
dp

VIMdiff is an amazing too for merging.