summaryrefslogtreecommitdiff
path: root/tools/merge_backup.py
Commit message (Expand)AuthorAgeFilesLines
* Merge is now run by shell script tools/merge.Linus Nordberg2015-11-101-7/+51
* Split merge.py into three pieces.Linus Nordberg2015-11-101-0/+108