summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorJohannes Ranke <jranke@uni-bremen.de>2016-11-12 16:25:11 +0100
committerJohannes Ranke <jranke@uni-bremen.de>2016-11-12 16:25:11 +0100
commit63c5cc6cd0e467186b9a8dbf3ae1702453ca13aa (patch)
tree83059ef34f4360464371d7fbab1bf7e823fdc937 /.gitignore
parent7ce7aae09dab2195f5a337c2df9faff955633e81 (diff)
Use vimdiff for merging
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions

Contact - Imprint