xxdiff is a graphical browser for viewing the differences between two or three files, or between two directories, and can be used to produce a merged version.
This is a companion discussion topic for the original entry at https://copr.fedorainfracloud.org/coprs/b00ga/xxdiff/