summaryrefslogtreecommitdiff
path: root/tools/mergetools.py
Commit message (Collapse)AuthorAgeFilesLines
* Add support for merge secondariesMagnus Ahltorp2015-04-231-0/+57