22 lines
951 B
Plaintext
22 lines
951 B
Plaintext
$OpenBSD: patch-commons_common_ml,v 1.1 2011/08/16 08:26:16 sthen Exp $
|
|
--- commons/common.ml.orig Thu Aug 11 15:51:39 2011
|
|
+++ commons/common.ml Thu Aug 11 15:52:01 2011
|
|
@@ -5347,7 +5347,7 @@ let (diff: (int -> int -> diff -> unit)-> (string list
|
|
write_file file1 (unwords xs);
|
|
write_file file2 (unwords ys);
|
|
command2
|
|
- ("diff --side-by-side -W 1 " ^ file1 ^ " " ^ file2 ^ " > " ^ fileresult);
|
|
+ ("gdiff --side-by-side -W 1 " ^ file1 ^ " " ^ file2 ^ " > " ^ fileresult);
|
|
let res = cat fileresult in
|
|
let a = ref 0 in
|
|
let b = ref 0 in
|
|
@@ -5375,7 +5375,7 @@ let (diff2: (int -> int -> diff -> unit) -> (string *
|
|
write_file "/tmp/diff1" xstr;
|
|
write_file "/tmp/diff2" ystr;
|
|
command2
|
|
- ("diff --side-by-side --left-column -W 1 " ^
|
|
+ ("gdiff --side-by-side --left-column -W 1 " ^
|
|
"/tmp/diff1 /tmp/diff2 > /tmp/diffresult");
|
|
let res = cat "/tmp/diffresult" in
|
|
let a = ref 0 in
|