-# $Id$
+# $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
if [ -z "$DISPLAY" ]; then
export P4MERGE="vim -o -c '3wincmd j' -c 'wincmd L'"
else
- export P4MERGE="p4v -merge"
+ export P4MERGE="p4merge"
fi