vapier-diff: add a common diff program to handle my prefs

[home.git] / .profile.d / google.sh

diff --git a/.profile.d/google.sh b/.profile.d/google.sh
index e44e506d4f3fff9b60b20828f48f9e42c5c3f591..45d300f732ab96240ecec6c5c59339c763892e2a 100644 (file)
--- a/.profile.d/google.sh
+++ b/.profile.d/google.sh
@@ -12,5 +12,7 @@ fi
 
 export CROSTOOLS_SKIP_SYNC="true"
 export CROSTOOLS_GSUTIL="gsutil"
+export P4DIFF="vapier-diff"
+export G4MULTIDIFF="0"
 export P4DIFFOPTS="-du"
 export ANDROID_USE_AMAKE="true"