summaryrefslogtreecommitdiffstats
path: root/src/merger.cpp
Commit message (Expand)AuthorAgeFilesLines
* Added abandoned KDE3 version of kdiff3tpearson2010-02-101-0/+87