summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
authorMagnus Ahltorp <map@kth.se>2015-01-28 13:42:06 +0100
committerLinus Nordberg <linus@nordberg.se>2015-02-20 14:12:47 +0100
commit832dba2e1cd4e6e6ff9e8ea7afa98eebb44595e5 (patch)
tree5ad6f45daf3a4fd66c5d3c576dda857e147210ff /README.md
parent7d9413dcea9645cfa0f8887ac7536682ff5777f0 (diff)
Move hardcoded merge parameters to command line
Diffstat (limited to 'README.md')
0 files changed, 0 insertions, 0 deletions