X-Git-Url: http://git.iain.cx/?a=blobdiff_plain;f=.profile.d%2Fp4.bashrc;h=7cdb1dba1847ad8c11fb207e13c32f3ae9c525b5;hb=9b2d4a12c4cbeea017e1abdd506bf9dcdc5b4910;hp=0422ee85858e4db642ecfdb4046a3061c38ce4f4;hpb=819bb88d5a014a23150b8fd609d194e883958674;p=profile.git

diff --git a/.profile.d/p4.bashrc b/.profile.d/p4.bashrc
index 0422ee8..7cdb1db 100644
--- a/.profile.d/p4.bashrc
+++ b/.profile.d/p4.bashrc
@@ -1,3 +1,4 @@
+# $Id: p4.bashrc 151 2008-11-20 13:59:19Z iain $
 if [ ! -z "$SUDO_USER" ]; then
   export P4USER=$SUDO_USER
   export P4TICKETS=/tmp/.p4tickets.$SUDO_USER
@@ -10,5 +11,5 @@ export P4EDITOR="vim -S '$HOME/.vim/script/p4'"
 if [ -z "$DISPLAY" ]; then
   export P4MERGE="vim -o -c '3wincmd j' -c 'wincmd L'"
 else
-  export P4MERGE="p4v -merge"
+  export P4MERGE="p4merge"
 fi