git://git.iain.cx/iain
/
profile.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Window tweaks for screen.
[profile.git]
/
.profile.d
/
p4.bashrc
diff --git
a/.profile.d/p4.bashrc
b/.profile.d/p4.bashrc
index
0422ee8
..
7cdb1db
100644
(file)
--- 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
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
if [ -z "$DISPLAY" ]; then
export P4MERGE="vim -o -c '3wincmd j' -c 'wincmd L'"
else
- export P4MERGE="p4
v -
merge"
+ export P4MERGE="p4merge"
fi
fi