Fossil SCM
Minor correction to text in usage help/comment in new --checkin option.
Commit
5aacaba35fdd2bae6feacb2c110c01aebf1c8693
Parent
3bb04c90dc7209e…
1 file changed
+2
-2
+2
-2
| --- src/diffcmd.c | ||
| +++ src/diffcmd.c | ||
| @@ -774,12 +774,12 @@ | ||
| 774 | 774 | ** If the "--to VERSION" option appears, it specifies the check-in from |
| 775 | 775 | ** which the second version of the file or files is taken. If there is |
| 776 | 776 | ** no "--to" option then the (possibly edited) files in the current check-out |
| 777 | 777 | ** are used. |
| 778 | 778 | ** |
| 779 | -** If the "--checkin VERSION" option shows the changes made by | |
| 780 | -** check-in VERSION relative to its primary parent | |
| 779 | +** The "--checkin VERSION" option shows the changes made by | |
| 780 | +** check-in VERSION relative to its primary parent. | |
| 781 | 781 | ** |
| 782 | 782 | ** The "-i" command-line option forces the use of the internal diff logic |
| 783 | 783 | ** rather than any external diff program that might be configured using |
| 784 | 784 | ** the "setting" command. If no external diff program is configured, then |
| 785 | 785 | ** the "-i" option is a no-op. The "-i" option converts "gdiff" into "diff". |
| 786 | 786 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -774,12 +774,12 @@ | |
| 774 | ** If the "--to VERSION" option appears, it specifies the check-in from |
| 775 | ** which the second version of the file or files is taken. If there is |
| 776 | ** no "--to" option then the (possibly edited) files in the current check-out |
| 777 | ** are used. |
| 778 | ** |
| 779 | ** If the "--checkin VERSION" option shows the changes made by |
| 780 | ** check-in VERSION relative to its primary parent |
| 781 | ** |
| 782 | ** The "-i" command-line option forces the use of the internal diff logic |
| 783 | ** rather than any external diff program that might be configured using |
| 784 | ** the "setting" command. If no external diff program is configured, then |
| 785 | ** the "-i" option is a no-op. The "-i" option converts "gdiff" into "diff". |
| 786 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -774,12 +774,12 @@ | |
| 774 | ** If the "--to VERSION" option appears, it specifies the check-in from |
| 775 | ** which the second version of the file or files is taken. If there is |
| 776 | ** no "--to" option then the (possibly edited) files in the current check-out |
| 777 | ** are used. |
| 778 | ** |
| 779 | ** The "--checkin VERSION" option shows the changes made by |
| 780 | ** check-in VERSION relative to its primary parent. |
| 781 | ** |
| 782 | ** The "-i" command-line option forces the use of the internal diff logic |
| 783 | ** rather than any external diff program that might be configured using |
| 784 | ** the "setting" command. If no external diff program is configured, then |
| 785 | ** the "-i" option is a no-op. The "-i" option converts "gdiff" into "diff". |
| 786 |