summaryrefslogtreecommitdiff
path: root/tools/merge_sth.py
Commit message (Expand)AuthorAgeFilesLines
* Remove debug printouts from merge programs.Linus Nordberg2015-11-201-2/+2
* Print the string "timing" and the name of the program in merge timing info.Linus Nordberg2015-11-101-1/+1
* Fix backup-quorum-size and use it.Linus Nordberg2015-11-101-3/+10
* Merge is now run by shell script tools/merge.Linus Nordberg2015-11-101-0/+123