From c6f9e172a8b99ddc6d119d2d3f1a89aa18e1a1cf Mon Sep 17 00:00:00 2001
From: Mitchel Humpherys <mitch.special@gmail.com>
Date: Tue, 7 Jan 2014 12:45:12 -0800
Subject: [PATCH] Remove gm alias due to conflicts with graphicsmagick

The graphicsmagick package provides a `gm' utility. Remove the `gm'
alias so that it doesn't clash.
---
 plugins/git/git.plugin.zsh | 2 --
 1 file changed, 2 deletions(-)

diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh
index 390d3be4d..7080a7d9f 100644
--- a/plugins/git/git.plugin.zsh
+++ b/plugins/git/git.plugin.zsh
@@ -68,8 +68,6 @@ alias gss='git status -s'
 compdef _git gss=git-status
 alias ga='git add'
 compdef _git ga=git-add
-alias gm='git merge'
-compdef _git gm=git-merge
 alias grh='git reset HEAD'
 alias grhh='git reset HEAD --hard'
 alias gclean='git reset --hard && git clean -dfx'