Fossil SCM
Help text improvements for diffcmd.c.
Commit
e1b51150afaf13a48b9a6378ddeef9bb316b7f6adbc5848313ec570501ecd532
Parent
2512d2d4728836a…
1 file changed
+5
-5
+5
-5
| --- src/diffcmd.c | ||
| +++ src/diffcmd.c | ||
| @@ -1042,31 +1042,31 @@ | ||
| 1042 | 1042 | ** -b Show a linear diff in the default web browser |
| 1043 | 1043 | ** -y Show a text side-by-side diff |
| 1044 | 1044 | ** --webpage Format output as HTML |
| 1045 | 1045 | ** --webpage -y HTML output in the side-by-side format |
| 1046 | 1046 | ** |
| 1047 | -** The "--from VERSION" option is used it specifies the source check-in | |
| 1047 | +** The "--from VERSION" option is used to specify the source check-in | |
| 1048 | 1048 | ** for the diff operation. If not specified, the source check-in is the |
| 1049 | 1049 | ** base check-in for the current check-out. Similarly, the "--to VERSION" |
| 1050 | 1050 | ** option specifies the check-in from which the second version of the file |
| 1051 | 1051 | ** or files is taken. If there is no "--to" option then the (possibly edited) |
| 1052 | 1052 | ** files in the current check-out are used. The "--checkin VERSION" option |
| 1053 | 1053 | ** shows the changes made by check-in VERSION relative to its primary parent. |
| 1054 | 1054 | ** The "--branch BRANCHNAME" shows all the changes on the branch BRANCHNAME. |
| 1055 | 1055 | ** |
| 1056 | -** The "-i" command-line option forces the use of Fossils own the internal | |
| 1056 | +** The "-i" command-line option forces the use of Fossil's own internal | |
| 1057 | 1057 | ** diff logic rather than any external diff program that might be configured |
| 1058 | 1058 | ** using the "setting" command. If no external diff program is configured, |
| 1059 | 1059 | ** then the "-i" option is a no-op. The "-i" option converts "gdiff" into |
| 1060 | 1060 | ** "diff". |
| 1061 | 1061 | ** |
| 1062 | 1062 | ** The "--diff-binary" option enables or disables the inclusion of binary files |
| 1063 | 1063 | ** when using an external diff program. |
| 1064 | 1064 | ** |
| 1065 | 1065 | ** The "--binary" option causes files matching the glob PATTERN to be treated |
| 1066 | -** as binary when considering if they should be used with external diff program. | |
| 1067 | -** This option overrides the "binary-glob" setting. | |
| 1066 | +** as binary when considering if they should be used with the external diff | |
| 1067 | +** program. This option overrides the "binary-glob" setting. | |
| 1068 | 1068 | ** |
| 1069 | 1069 | ** These command show differences between managed files. Use the "fossil xdiff" |
| 1070 | 1070 | ** command to see differences in unmanaged files. |
| 1071 | 1071 | ** |
| 1072 | 1072 | ** Options: |
| @@ -1085,11 +1085,11 @@ | ||
| 1085 | 1085 | ** -r|--from VERSION Select VERSION as source for the diff |
| 1086 | 1086 | ** -w|--ignore-all-space Ignore white space when comparing lines |
| 1087 | 1087 | ** -i|--internal Use internal diff logic |
| 1088 | 1088 | ** --json Output formatted as JSON |
| 1089 | 1089 | ** -N|--new-file Alias for --verbose |
| 1090 | -** --numstat Show only the number of lines delete and added | |
| 1090 | +** --numstat Show only the number of added and deleted lines | |
| 1091 | 1091 | ** -y|--side-by-side Side-by-side diff |
| 1092 | 1092 | ** --strip-trailing-cr Strip trailing CR |
| 1093 | 1093 | ** --tcl TCL-formated output used internally by --tk |
| 1094 | 1094 | ** --tclsh PATH TCL/TK used for --tk (default: "tclsh") |
| 1095 | 1095 | ** --tk Launch a Tcl/Tk GUI for display |
| 1096 | 1096 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -1042,31 +1042,31 @@ | |
| 1042 | ** -b Show a linear diff in the default web browser |
| 1043 | ** -y Show a text side-by-side diff |
| 1044 | ** --webpage Format output as HTML |
| 1045 | ** --webpage -y HTML output in the side-by-side format |
| 1046 | ** |
| 1047 | ** The "--from VERSION" option is used it specifies the source check-in |
| 1048 | ** for the diff operation. If not specified, the source check-in is the |
| 1049 | ** base check-in for the current check-out. Similarly, the "--to VERSION" |
| 1050 | ** option specifies the check-in from which the second version of the file |
| 1051 | ** or files is taken. If there is no "--to" option then the (possibly edited) |
| 1052 | ** files in the current check-out are used. The "--checkin VERSION" option |
| 1053 | ** shows the changes made by check-in VERSION relative to its primary parent. |
| 1054 | ** The "--branch BRANCHNAME" shows all the changes on the branch BRANCHNAME. |
| 1055 | ** |
| 1056 | ** The "-i" command-line option forces the use of Fossils own the internal |
| 1057 | ** diff logic rather than any external diff program that might be configured |
| 1058 | ** using the "setting" command. If no external diff program is configured, |
| 1059 | ** then the "-i" option is a no-op. The "-i" option converts "gdiff" into |
| 1060 | ** "diff". |
| 1061 | ** |
| 1062 | ** The "--diff-binary" option enables or disables the inclusion of binary files |
| 1063 | ** when using an external diff program. |
| 1064 | ** |
| 1065 | ** The "--binary" option causes files matching the glob PATTERN to be treated |
| 1066 | ** as binary when considering if they should be used with external diff program. |
| 1067 | ** This option overrides the "binary-glob" setting. |
| 1068 | ** |
| 1069 | ** These command show differences between managed files. Use the "fossil xdiff" |
| 1070 | ** command to see differences in unmanaged files. |
| 1071 | ** |
| 1072 | ** Options: |
| @@ -1085,11 +1085,11 @@ | |
| 1085 | ** -r|--from VERSION Select VERSION as source for the diff |
| 1086 | ** -w|--ignore-all-space Ignore white space when comparing lines |
| 1087 | ** -i|--internal Use internal diff logic |
| 1088 | ** --json Output formatted as JSON |
| 1089 | ** -N|--new-file Alias for --verbose |
| 1090 | ** --numstat Show only the number of lines delete and added |
| 1091 | ** -y|--side-by-side Side-by-side diff |
| 1092 | ** --strip-trailing-cr Strip trailing CR |
| 1093 | ** --tcl TCL-formated output used internally by --tk |
| 1094 | ** --tclsh PATH TCL/TK used for --tk (default: "tclsh") |
| 1095 | ** --tk Launch a Tcl/Tk GUI for display |
| 1096 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -1042,31 +1042,31 @@ | |
| 1042 | ** -b Show a linear diff in the default web browser |
| 1043 | ** -y Show a text side-by-side diff |
| 1044 | ** --webpage Format output as HTML |
| 1045 | ** --webpage -y HTML output in the side-by-side format |
| 1046 | ** |
| 1047 | ** The "--from VERSION" option is used to specify the source check-in |
| 1048 | ** for the diff operation. If not specified, the source check-in is the |
| 1049 | ** base check-in for the current check-out. Similarly, the "--to VERSION" |
| 1050 | ** option specifies the check-in from which the second version of the file |
| 1051 | ** or files is taken. If there is no "--to" option then the (possibly edited) |
| 1052 | ** files in the current check-out are used. The "--checkin VERSION" option |
| 1053 | ** shows the changes made by check-in VERSION relative to its primary parent. |
| 1054 | ** The "--branch BRANCHNAME" shows all the changes on the branch BRANCHNAME. |
| 1055 | ** |
| 1056 | ** The "-i" command-line option forces the use of Fossil's own internal |
| 1057 | ** diff logic rather than any external diff program that might be configured |
| 1058 | ** using the "setting" command. If no external diff program is configured, |
| 1059 | ** then the "-i" option is a no-op. The "-i" option converts "gdiff" into |
| 1060 | ** "diff". |
| 1061 | ** |
| 1062 | ** The "--diff-binary" option enables or disables the inclusion of binary files |
| 1063 | ** when using an external diff program. |
| 1064 | ** |
| 1065 | ** The "--binary" option causes files matching the glob PATTERN to be treated |
| 1066 | ** as binary when considering if they should be used with the external diff |
| 1067 | ** program. This option overrides the "binary-glob" setting. |
| 1068 | ** |
| 1069 | ** These command show differences between managed files. Use the "fossil xdiff" |
| 1070 | ** command to see differences in unmanaged files. |
| 1071 | ** |
| 1072 | ** Options: |
| @@ -1085,11 +1085,11 @@ | |
| 1085 | ** -r|--from VERSION Select VERSION as source for the diff |
| 1086 | ** -w|--ignore-all-space Ignore white space when comparing lines |
| 1087 | ** -i|--internal Use internal diff logic |
| 1088 | ** --json Output formatted as JSON |
| 1089 | ** -N|--new-file Alias for --verbose |
| 1090 | ** --numstat Show only the number of added and deleted lines |
| 1091 | ** -y|--side-by-side Side-by-side diff |
| 1092 | ** --strip-trailing-cr Strip trailing CR |
| 1093 | ** --tcl TCL-formated output used internally by --tk |
| 1094 | ** --tclsh PATH TCL/TK used for --tk (default: "tclsh") |
| 1095 | ** --tk Launch a Tcl/Tk GUI for display |
| 1096 |