From 2c0698fa14279171ab3c351dd4d344c3b2b2decc Mon Sep 17 00:00:00 2001
From: Florian Tham <tham@fidion.de>
Date: Fri, 3 Feb 2017 12:15:23 +0100
Subject: [PATCH] add difftool aliases

---
 lib/git/aliases.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/lib/git/aliases.sh b/lib/git/aliases.sh
index 7784ffd..7a57a1d 100644
--- a/lib/git/aliases.sh
+++ b/lib/git/aliases.sh
@@ -112,6 +112,8 @@ if [ "$git_setup_aliases" = "yes" ]; then
   __git_alias "$git_add_patch_alias"                'git' 'add' '-p'
   __git_alias "$git_add_updated_alias"              'git' 'add' '-u'
   __git_alias "$git_difftool_alias"                 'git' 'difftool'
+  __git_alias "$git_difftool_meld_alias"            'git' 'difftool -y -t meld'
+  __git_alias "$git_difftool_vimdiff_alias"         'git' 'difftool -y -t vimdiff'
 
   # Custom default format for git log
   git_log_command="log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"