add subversion vimdiff

lovelock · Mar 7, 2016 · 479f90f · 479f90f
1 parent 7337b06
commit 479f90f
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/utils/vimdiff.sh b/utils/vimdiff.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+# Configure your favorite diff program here.
+DIFF=vimdiff
+
+# Subversion provides the paths we need as the sixth and seventh
+# parameters.
+LEFT=${6}
+RIGHT=${7}
+
+# Call the diff command (change the following line to make sense for
+# your merge program).
+$DIFF $LEFT $RIGHT
+
+# Return an errorcode of 0 if no differences were detected, 1 if some were.
+# Any other errorcode will be treated as fatal.