Using vimdiff

vimdiff works on two, three or four files, opens each file in a separate window and highlights the differences between the files. The files can be edited using the vim commands. vimdiff is a useful tool for finding the differences between different versions of a file and for resolving conflicts between file versions.… Read more