summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorMagnus Ahltorp <map@kth.se>2014-10-20 14:33:41 +0200
committerMagnus Ahltorp <map@kth.se>2014-10-22 16:41:41 +0200
commitba5e731d2998e8200121d9f96870a2c54889a6c4 (patch)
tree1a0da02c07c4fa5d9f104232ebc6bcf087b69449 /.gitignore
parentf0af87c5851f8c3c244eb5f5ac7921dc9a672c5a (diff)
Added external merging support
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions