Fossil SCM

merge

jan.nijtmans 2012-09-26 14:11 trunk merge
Commit 84f1b5b37f15cc30deb816978b5fb8a04b4e7f39
2 files changed +1 -1 +1 -1
+1 -1
--- src/diffcmd.c
+++ src/diffcmd.c
@@ -532,11 +532,11 @@
532532
int i;
533533
Blob script;
534534
char *zTempFile;
535535
char *zCmd;
536536
blob_zero(&script);
537
- blob_appendf(&script, "set cmd {| \"%s\" diff --html -y", g.argv[0]);
537
+ blob_appendf(&script, "set cmd {| \"%/\" diff --html -y", g.nameOfExe);
538538
for(i=2; i<g.argc; i++){
539539
blob_appendf(&script, " \"%s\"", g.argv[i]);
540540
}
541541
blob_appendf(&script, "}\n%s", zDiffScript);
542542
zTempFile = write_blob_to_temp_file(&script);
543543
--- src/diffcmd.c
+++ src/diffcmd.c
@@ -532,11 +532,11 @@
532 int i;
533 Blob script;
534 char *zTempFile;
535 char *zCmd;
536 blob_zero(&script);
537 blob_appendf(&script, "set cmd {| \"%s\" diff --html -y", g.argv[0]);
538 for(i=2; i<g.argc; i++){
539 blob_appendf(&script, " \"%s\"", g.argv[i]);
540 }
541 blob_appendf(&script, "}\n%s", zDiffScript);
542 zTempFile = write_blob_to_temp_file(&script);
543
--- src/diffcmd.c
+++ src/diffcmd.c
@@ -532,11 +532,11 @@
532 int i;
533 Blob script;
534 char *zTempFile;
535 char *zCmd;
536 blob_zero(&script);
537 blob_appendf(&script, "set cmd {| \"%/\" diff --html -y", g.nameOfExe);
538 for(i=2; i<g.argc; i++){
539 blob_appendf(&script, " \"%s\"", g.argv[i]);
540 }
541 blob_appendf(&script, "}\n%s", zDiffScript);
542 zTempFile = write_blob_to_temp_file(&script);
543
+1 -1
--- src/diffcmd.c
+++ src/diffcmd.c
@@ -532,11 +532,11 @@
532532
int i;
533533
Blob script;
534534
char *zTempFile;
535535
char *zCmd;
536536
blob_zero(&script);
537
- blob_appendf(&script, "set cmd {| \"%s\" diff --html -y", g.argv[0]);
537
+ blob_appendf(&script, "set cmd {| \"%/\" diff --html -y", g.nameOfExe);
538538
for(i=2; i<g.argc; i++){
539539
blob_appendf(&script, " \"%s\"", g.argv[i]);
540540
}
541541
blob_appendf(&script, "}\n%s", zDiffScript);
542542
zTempFile = write_blob_to_temp_file(&script);
543543
--- src/diffcmd.c
+++ src/diffcmd.c
@@ -532,11 +532,11 @@
532 int i;
533 Blob script;
534 char *zTempFile;
535 char *zCmd;
536 blob_zero(&script);
537 blob_appendf(&script, "set cmd {| \"%s\" diff --html -y", g.argv[0]);
538 for(i=2; i<g.argc; i++){
539 blob_appendf(&script, " \"%s\"", g.argv[i]);
540 }
541 blob_appendf(&script, "}\n%s", zDiffScript);
542 zTempFile = write_blob_to_temp_file(&script);
543
--- src/diffcmd.c
+++ src/diffcmd.c
@@ -532,11 +532,11 @@
532 int i;
533 Blob script;
534 char *zTempFile;
535 char *zCmd;
536 blob_zero(&script);
537 blob_appendf(&script, "set cmd {| \"%/\" diff --html -y", g.nameOfExe);
538 for(i=2; i<g.argc; i++){
539 blob_appendf(&script, " \"%s\"", g.argv[i]);
540 }
541 blob_appendf(&script, "}\n%s", zDiffScript);
542 zTempFile = write_blob_to_temp_file(&script);
543

Keyboard Shortcuts

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