From 8761a4758bc06c3d0c72c4c751736cb05c3ac35f Mon Sep 17 00:00:00 2001
From: Jeff Byrnes <jeff@evertrue.com>
Date: Wed, 8 Oct 2014 14:53:26 -0400
Subject: [PATCH] Add alias & default shortcut for `git mergetool`

Provides parity with the `gdt` alias for `git difftool`
---
 git.scmbrc.example | 1 +
 lib/git/aliases.sh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/git.scmbrc.example b/git.scmbrc.example
index a1ccca3..e5e2aa0 100644
--- a/git.scmbrc.example
+++ b/git.scmbrc.example
@@ -53,6 +53,7 @@ git_diff_file_alias="gdf"
 git_diff_word_alias="gdw"
 git_diff_cached_alias="gdc"
 git_difftool_alias="gdt"
+git_mergetool_alias="gmt"
 # 3. Standard commands
 git_clone_alias="gcl"
 git_fetch_alias="gf"
diff --git a/lib/git/aliases.sh b/lib/git/aliases.sh
index 28b0e31..91e3c9d 100644
--- a/lib/git/aliases.sh
+++ b/lib/git/aliases.sh
@@ -113,6 +113,7 @@ 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_mergetool_alias"                'git' 'mergetool'
 
   # 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"