Description
Conflicting text files can be merged interactively in the terminal with two-way or three-way comparison.
It is useful for developers resolving version-control conflicts or combining edited files. Merge tools change source files, so users should review the final result before saving or committing.