aac5c98a37
- The new bsddiff in FreeBSD 12 does not yet support --old-group-format - Fix python shebangfix to require python2 PR: 219277 Submitted by: bsam
11 lines
570 B
C
11 lines
570 B
C
--- src/diffviewer/ydiff.c.orig 2017-03-04 20:51:38 UTC
|
|
+++ src/diffviewer/ydiff.c
|
|
@@ -816,7 +816,7 @@ dff_execute (const char *args, const char *extra, cons
|
|
/* escape potential $ to avoid shell variable substitutions in popen() */
|
|
file1_esc = strutils_shell_escape (file1);
|
|
file2_esc = strutils_shell_escape (file2);
|
|
- cmd = g_strdup_printf ("diff %s %s %s %s %s", args, extra, opt, file1_esc, file2_esc);
|
|
+ cmd = g_strdup_printf ("gdiff %s %s %s %s %s", args, extra, opt, file1_esc, file2_esc);
|
|
g_free (file1_esc);
|
|
g_free (file2_esc);
|
|
|