Fossil SCM

Make the "--tk" option to the "diff" command also imply the "-i" option to force the use of the internal diff engine.

drh 2012-09-29 14:08 trunk
Commit 5a4fbb0a2800b8f36c431427a39a8d6062ef57e8
1 file changed +1 -1
+1 -1
--- src/diffcmd.c
+++ src/diffcmd.c
@@ -534,11 +534,11 @@
534534
int i;
535535
Blob script;
536536
char *zTempFile;
537537
char *zCmd;
538538
blob_zero(&script);
539
- blob_appendf(&script, "set cmd {| \"%/\" diff --html -y", g.nameOfExe);
539
+ blob_appendf(&script, "set cmd {| \"%/\" diff --html -y -i", g.nameOfExe);
540540
for(i=2; i<g.argc; i++){
541541
blob_appendf(&script, " \"%s\"", g.argv[i]);
542542
}
543543
blob_appendf(&script, "}\n%s", zDiffScript);
544544
zTempFile = write_blob_to_temp_file(&script);
545545
--- src/diffcmd.c
+++ src/diffcmd.c
@@ -534,11 +534,11 @@
534 int i;
535 Blob script;
536 char *zTempFile;
537 char *zCmd;
538 blob_zero(&script);
539 blob_appendf(&script, "set cmd {| \"%/\" diff --html -y", g.nameOfExe);
540 for(i=2; i<g.argc; i++){
541 blob_appendf(&script, " \"%s\"", g.argv[i]);
542 }
543 blob_appendf(&script, "}\n%s", zDiffScript);
544 zTempFile = write_blob_to_temp_file(&script);
545
--- src/diffcmd.c
+++ src/diffcmd.c
@@ -534,11 +534,11 @@
534 int i;
535 Blob script;
536 char *zTempFile;
537 char *zCmd;
538 blob_zero(&script);
539 blob_appendf(&script, "set cmd {| \"%/\" diff --html -y -i", g.nameOfExe);
540 for(i=2; i<g.argc; i++){
541 blob_appendf(&script, " \"%s\"", g.argv[i]);
542 }
543 blob_appendf(&script, "}\n%s", zDiffScript);
544 zTempFile = write_blob_to_temp_file(&script);
545

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button