added meld as merge tool

This commit is contained in:
Paweł Płazieński 2016-03-10 10:46:50 +01:00
parent 634acad407
commit 047ccf41d6

View file

@ -14,3 +14,5 @@
editor = vim editor = vim
[diff] [diff]
tool = meld tool = meld
[merge]
tool = meld