summaryrefslogtreecommitdiff
path: root/tools/mergetools.py
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordu.net>2015-09-27 11:40:47 +0200
committerLinus Nordberg <linus@nordu.net>2015-11-20 10:14:15 +0100
commitc308b5eee38c58e122f6eebcca575ed6734bb3b7 (patch)
tree114974089bcf05de29d5d30141bcab9fa2ba834a /tools/mergetools.py
parentb87783cc3dc39d5b2aa1c170cf5afaefc289c85a (diff)
make tests work(s)
Diffstat (limited to 'tools/mergetools.py')
0 files changed, 0 insertions, 0 deletions