Merging differences

Published: Sunday, Aug 31, 2008 Last modified: Thursday, Dec 3, 2020

:help merge


do
dp

VIMdiff is an amazing too for merging.