summaryrefslogtreecommitdiff
path: root/tools/mergetools.py
Commit message (Collapse)AuthorAgeFilesLines
* Preliminary merge secondary support. Change merge db to lowercase.Magnus Ahltorp2015-07-311-5/+9
|
* Fix copyright notes.Linus Nordberg2015-04-231-1/+1
|
* Add support for merge secondariesMagnus Ahltorp2015-04-231-0/+57