summaryrefslogtreecommitdiff
path: root/tools/merge
diff options
context:
space:
mode:
authorLinus Nordberg <linus@nordu.net>2015-11-20 10:48:44 +0100
committerLinus Nordberg <linus@nordu.net>2015-11-20 10:48:44 +0100
commitf1fb5a44dd8f1560040cccaf455d5786326bf264 (patch)
tree92ec9efe0251056d2980fe3f64dc7bb865b5047b /tools/merge
parentf3d1659b37351fe2ad958114631f8c1578712e51 (diff)
Make merge_sth work again after last commit.
Diffstat (limited to 'tools/merge')
0 files changed, 0 insertions, 0 deletions