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