Fossil SCM
Use the official spelling of Tcl/Tk in the help texts for the diff commands.
Commit
b89f4cdb69a3c4d5f1da85b78024efe8e782cb30eda4094b732070566db87238
Parent
a99a0fc08ba1f39…
1 file changed
+4
-4
+4
-4
| --- src/diffcmd.c | ||
| +++ src/diffcmd.c | ||
| @@ -1173,11 +1173,11 @@ | ||
| 1173 | 1173 | ** |
| 1174 | 1174 | ** The default output format is a "unified patch" (the same as the |
| 1175 | 1175 | ** output of "diff -u" on most unix systems). Many alternative formats |
| 1176 | 1176 | ** are available. A few of the more useful alternatives: |
| 1177 | 1177 | ** |
| 1178 | -** --tk Pop up a TCL/TK-based GUI to show the diff | |
| 1178 | +** --tk Pop up a Tcl/Tk-based GUI to show the diff | |
| 1179 | 1179 | ** --by Show a side-by-side diff in the default web browser |
| 1180 | 1180 | ** -b Show a linear diff in the default web browser |
| 1181 | 1181 | ** -y Show a text side-by-side diff |
| 1182 | 1182 | ** --webpage Format output as HTML |
| 1183 | 1183 | ** --webpage -y HTML output in the side-by-side format |
| @@ -1216,11 +1216,11 @@ | ||
| 1216 | 1216 | ** --by Shorthand for "--browser -y" |
| 1217 | 1217 | ** -ci|--checkin VERSION Show diff of all changes in VERSION |
| 1218 | 1218 | ** --command PROG External diff program. Overrides "diff-command" |
| 1219 | 1219 | ** -c|--context N Show N lines of context around each change, with |
| 1220 | 1220 | ** negative N meaning show all content |
| 1221 | -** --dark Use dark mode for the TCL/TK-based GUI and HTML | |
| 1221 | +** --dark Use dark mode for the Tcl/Tk-based GUI and HTML | |
| 1222 | 1222 | ** --diff-binary BOOL Include binary files with external commands |
| 1223 | 1223 | ** --exec-abs-paths Force absolute path names on external commands |
| 1224 | 1224 | ** --exec-rel-paths Force relative path names on external commands |
| 1225 | 1225 | ** -r|--from VERSION Select VERSION as source for the diff |
| 1226 | 1226 | ** -w|--ignore-all-space Ignore white space when comparing lines |
| @@ -1228,12 +1228,12 @@ | ||
| 1228 | 1228 | ** --json Output formatted as JSON |
| 1229 | 1229 | ** -N|--new-file Alias for --verbose |
| 1230 | 1230 | ** --numstat Show only the number of added and deleted lines |
| 1231 | 1231 | ** -y|--side-by-side Side-by-side diff |
| 1232 | 1232 | ** --strip-trailing-cr Strip trailing CR |
| 1233 | -** --tcl TCL-formated output used internally by --tk | |
| 1234 | -** --tclsh PATH TCL/TK used for --tk (default: "tclsh") | |
| 1233 | +** --tcl Tcl-formated output used internally by --tk | |
| 1234 | +** --tclsh PATH Tcl/Tk shell used for --tk (default: "tclsh") | |
| 1235 | 1235 | ** --tk Launch a Tcl/Tk GUI for display |
| 1236 | 1236 | ** --to VERSION Select VERSION as target for the diff |
| 1237 | 1237 | ** --undo Diff against the "undo" buffer |
| 1238 | 1238 | ** --unified Unified diff |
| 1239 | 1239 | ** -v|--verbose Output complete text of added or deleted files |
| 1240 | 1240 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -1173,11 +1173,11 @@ | |
| 1173 | ** |
| 1174 | ** The default output format is a "unified patch" (the same as the |
| 1175 | ** output of "diff -u" on most unix systems). Many alternative formats |
| 1176 | ** are available. A few of the more useful alternatives: |
| 1177 | ** |
| 1178 | ** --tk Pop up a TCL/TK-based GUI to show the diff |
| 1179 | ** --by Show a side-by-side diff in the default web browser |
| 1180 | ** -b Show a linear diff in the default web browser |
| 1181 | ** -y Show a text side-by-side diff |
| 1182 | ** --webpage Format output as HTML |
| 1183 | ** --webpage -y HTML output in the side-by-side format |
| @@ -1216,11 +1216,11 @@ | |
| 1216 | ** --by Shorthand for "--browser -y" |
| 1217 | ** -ci|--checkin VERSION Show diff of all changes in VERSION |
| 1218 | ** --command PROG External diff program. Overrides "diff-command" |
| 1219 | ** -c|--context N Show N lines of context around each change, with |
| 1220 | ** negative N meaning show all content |
| 1221 | ** --dark Use dark mode for the TCL/TK-based GUI and HTML |
| 1222 | ** --diff-binary BOOL Include binary files with external commands |
| 1223 | ** --exec-abs-paths Force absolute path names on external commands |
| 1224 | ** --exec-rel-paths Force relative path names on external commands |
| 1225 | ** -r|--from VERSION Select VERSION as source for the diff |
| 1226 | ** -w|--ignore-all-space Ignore white space when comparing lines |
| @@ -1228,12 +1228,12 @@ | |
| 1228 | ** --json Output formatted as JSON |
| 1229 | ** -N|--new-file Alias for --verbose |
| 1230 | ** --numstat Show only the number of added and deleted lines |
| 1231 | ** -y|--side-by-side Side-by-side diff |
| 1232 | ** --strip-trailing-cr Strip trailing CR |
| 1233 | ** --tcl TCL-formated output used internally by --tk |
| 1234 | ** --tclsh PATH TCL/TK used for --tk (default: "tclsh") |
| 1235 | ** --tk Launch a Tcl/Tk GUI for display |
| 1236 | ** --to VERSION Select VERSION as target for the diff |
| 1237 | ** --undo Diff against the "undo" buffer |
| 1238 | ** --unified Unified diff |
| 1239 | ** -v|--verbose Output complete text of added or deleted files |
| 1240 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -1173,11 +1173,11 @@ | |
| 1173 | ** |
| 1174 | ** The default output format is a "unified patch" (the same as the |
| 1175 | ** output of "diff -u" on most unix systems). Many alternative formats |
| 1176 | ** are available. A few of the more useful alternatives: |
| 1177 | ** |
| 1178 | ** --tk Pop up a Tcl/Tk-based GUI to show the diff |
| 1179 | ** --by Show a side-by-side diff in the default web browser |
| 1180 | ** -b Show a linear diff in the default web browser |
| 1181 | ** -y Show a text side-by-side diff |
| 1182 | ** --webpage Format output as HTML |
| 1183 | ** --webpage -y HTML output in the side-by-side format |
| @@ -1216,11 +1216,11 @@ | |
| 1216 | ** --by Shorthand for "--browser -y" |
| 1217 | ** -ci|--checkin VERSION Show diff of all changes in VERSION |
| 1218 | ** --command PROG External diff program. Overrides "diff-command" |
| 1219 | ** -c|--context N Show N lines of context around each change, with |
| 1220 | ** negative N meaning show all content |
| 1221 | ** --dark Use dark mode for the Tcl/Tk-based GUI and HTML |
| 1222 | ** --diff-binary BOOL Include binary files with external commands |
| 1223 | ** --exec-abs-paths Force absolute path names on external commands |
| 1224 | ** --exec-rel-paths Force relative path names on external commands |
| 1225 | ** -r|--from VERSION Select VERSION as source for the diff |
| 1226 | ** -w|--ignore-all-space Ignore white space when comparing lines |
| @@ -1228,12 +1228,12 @@ | |
| 1228 | ** --json Output formatted as JSON |
| 1229 | ** -N|--new-file Alias for --verbose |
| 1230 | ** --numstat Show only the number of added and deleted lines |
| 1231 | ** -y|--side-by-side Side-by-side diff |
| 1232 | ** --strip-trailing-cr Strip trailing CR |
| 1233 | ** --tcl Tcl-formated output used internally by --tk |
| 1234 | ** --tclsh PATH Tcl/Tk shell used for --tk (default: "tclsh") |
| 1235 | ** --tk Launch a Tcl/Tk GUI for display |
| 1236 | ** --to VERSION Select VERSION as target for the diff |
| 1237 | ** --undo Diff against the "undo" buffer |
| 1238 | ** --unified Unified diff |
| 1239 | ** -v|--verbose Output complete text of added or deleted files |
| 1240 |