To err is human, but to really mess things up you need a computer.
kdiff3 dir1 dir2 | Compare/Merge two directories |
kdiff3 dir1 dir2 dir3 | Compare/Merge three directories. (dir1 is the base, dir3 is the destination dir for the merge) |
kdiff3 dir1 dir2 -o destdir | Compare/Merge two directories, with the merge result written to destdir. |
kdiff3 dir1 dir2 dir3 -o destdir | Compare/Merge three directories, with the merge result written to destdir. |
The idea for this coloring scheme I came upon in dirdiff. The colors resemble the colors of a leaf that is green when new, turns yellow later and red when old.