X-Git-Url: http://git.iain.cx/?p=profile.git;a=blobdiff_plain;f=.profile.d%2Fp4.bashrc;h=94cd19c606b7a44c7c432714c012077dcc11477d;hp=93627f1149afb56110f691da08414da7ae4b2e07;hb=1d8d630522282efbefe26e1e8c5a150b9d51d276;hpb=38e73bd0f8a6b326fb47e4cba06587b03e561a07

diff --git a/.profile.d/p4.bashrc b/.profile.d/p4.bashrc
index 93627f1..94cd19c 100644
--- a/.profile.d/p4.bashrc
+++ b/.profile.d/p4.bashrc
@@ -5,7 +5,8 @@ else
   export P4USER=$USER
 fi
 export P4CONFIG=.p4config
-export P4DIFF="diff -u"
+eval $(alias diff 2>/dev/null | sed 's/^alias diff/P4DIFF/')
+export P4DIFF="${P4DIFF:-diff} -u"
 if [ -e "$HOME/.vim/script/p4" ]; then
   export P4EDITOR="vim -S '$HOME/.vim/script/p4'"
 else