I find it convenient to use a "skeleton liner" that copies and compares text using Python's "difflib". For comparing files, "vimdiff" is useful. However, there are things about "vimdiff" that I find ...

When Git cannot automatically resolve conflicts it writes a file with conflict markers surrounding the conflicting areas. These conflicts must be resolved manually. This is often done via a three-way ...