From 47f3a67f97634c84e7770722dd19a09e18d99b2d Mon Sep 17 00:00:00 2001
From: Hugues Hiegel <hugues@hiegel.fr>
Date: Mon, 20 Apr 2009 13:55:33 +0200
Subject: [Aliases] 'hg' conflicts with mercurial..

---
 user:hugues/Aliases.zsh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/user:hugues/Aliases.zsh b/user:hugues/Aliases.zsh
index 1a1daa9..08f48e2 100644
--- a/user:hugues/Aliases.zsh
+++ b/user:hugues/Aliases.zsh
@@ -52,7 +52,8 @@ a RT='find -type f \( -name "*~" -o -name ".*~" -o -name "#*#" -o -name ".*.swp"
 a grep='grep --color=auto'
 a egrep='egrep --color=auto'
 
-a hg='history -E 0| grep'
+# Was 'hg', but conflicts with Mercurial..
+a histg='history -E 0| grep'
 a lg='ls -lap | grep'
 
 a so='cd ${OLDPWD}'
-- 
cgit v1.2.3