diff options
| author | Linus Nordberg <linus@nordu.net> | 2015-11-20 10:48:44 +0100 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2015-11-20 10:48:44 +0100 |
| commit | f1fb5a44dd8f1560040cccaf455d5786326bf264 (patch) | |
| tree | 92ec9efe0251056d2980fe3f64dc7bb865b5047b /tools/merge | |
| parent | f3d1659b37351fe2ad958114631f8c1578712e51 (diff) | |
Make merge_sth work again after last commit.
Diffstat (limited to 'tools/merge')
0 files changed, 0 insertions, 0 deletions