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

diff --git a/.profile.d/p4.bashrc b/.profile.d/p4.bashrc
index 94cd19c..b4134c0 100644
--- a/.profile.d/p4.bashrc
+++ b/.profile.d/p4.bashrc
@@ -13,7 +13,11 @@ else
   export P4EDITOR=vim
 fi
 if [ -z "$DISPLAY" ]; then
-  export P4MERGE="vim -o -c '3wincmd j' -c 'wincmd L'"
+  if [ -e "$HOME/.vim/script/p4" ]; then
+    export P4MERGE="vim -S '$HOME/.vim/script/p4'"
+  else
+    export P4MERGE="vim -o -c '3wincmd j' -c 'wincmd L'"
+  fi
 else
   export P4MERGE="p4merge"
 fi