summaryrefslogtreecommitdiff
path: root/tools/merge.py
Commit message (Expand)AuthorAgeFilesLines
* merge.py: send whole sth in sendsth callMagnus Ahltorp2014-10-271-1/+26
* Handle missing entries in mergeMagnus Ahltorp2014-10-271-2/+26
* System tests for external mergeMagnus Ahltorp2014-10-241-1/+1
* Added external merging supportMagnus Ahltorp2014-10-241-0/+133