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-20 14:33:41 +0200
commitd8022ec19b65e042f1fbe10074a5dec8be6e59d3 (patch)
tree7bc945038c6f481188391be3046fbeada26d488f /.gitignore
parent1e02171c56b9c78bb7ebe6739f831d51453eee80 (diff)
Added external merging support
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions