From 6f735020aefa7e28e9fe57bb80eecdde681ddf1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Denny=20Sch=C3=A4fer?= <d.schaefer@cevo.de>
Date: Mon, 26 Aug 2013 13:08:24 +0200
Subject: [PATCH] Add git merge to the expanded numeric commands

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

diff --git a/lib/git/aliases.sh b/lib/git/aliases.sh
index 66a58a7..89d12ff 100644
--- a/lib/git/aliases.sh
+++ b/lib/git/aliases.sh
@@ -26,7 +26,7 @@ if type hub > /dev/null 2>&1; then export _git_cmd="hub"; fi
 function git(){
   # Only expand args for git commands that deal with paths or branches
   case $1 in
-    checkout|commit|rm|blame|diff|add|log|rebase|reset)
+    checkout|commit|rm|blame|diff|add|log|rebase|reset|merge)
       exec_scmb_expand_args "$_git_cmd" "$@";;
     branch)
       _scmb_git_branch_shortcuts "${@:2}";;