Merging differences

Published: Sunday, Aug 31, 2008 Last modified: Thursday, Sep 28, 2023

:help merge


do
dp

VIMdiff is an amazing too for merging.