summaryrefslogtreecommitdiffstats
path: root/.vimrc
diff options
context:
space:
mode:
authorFlorian Pritz <bluewind@xinu.at>2015-05-14 18:04:32 +0200
committerFlorian Pritz <bluewind@xinu.at>2015-05-14 18:04:32 +0200
commit72ba15a3939fa1840f3ef901d56cfc6ccb5fd20b (patch)
treed21ef5811364e855fce51140fc397650bd2b6792 /.vimrc
parent20bebb79ed8ced8f827f91e83c4fe22ad66d86c4 (diff)
downloaddotfiles-72ba15a3939fa1840f3ef901d56cfc6ccb5fd20b.tar.gz
dotfiles-72ba15a3939fa1840f3ef901d56cfc6ccb5fd20b.tar.xz
git: add vim mergetool
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Diffstat (limited to '.vimrc')
0 files changed, 0 insertions, 0 deletions