Fossil SCM
Adapt some comments.
Commit
c0b42f23a3c2e0b530514d3f36d9dd09da55552f
Parent
7763b2e64cf6903…
2 files changed
+2
+1
-1
+2
| --- src/diff.c | ||
| +++ src/diff.c | ||
| @@ -1865,14 +1865,16 @@ | ||
| 1865 | 1865 | ** --brief Show filenames only DIFF_BRIEF |
| 1866 | 1866 | ** --context|-c N N lines of context. DIFF_CONTEXT_MASK |
| 1867 | 1867 | ** --html Format for HTML DIFF_HTML |
| 1868 | 1868 | ** --invert Invert the diff DIFF_INVERT |
| 1869 | 1869 | ** --ignore-space-at-eol Ignore eol-whitespaces DIFF_IGNORE_EOLWS |
| 1870 | +** --ignore-space-at-sol Ignore sol-whitespaces DIFF_IGNORE_SOLWS | |
| 1870 | 1871 | ** --linenum|-n Show line numbers DIFF_LINENO |
| 1871 | 1872 | ** --noopt Disable optimization DIFF_NOOPT |
| 1872 | 1873 | ** --side-by-side|-y Side-by-side diff. DIFF_SIDEBYSIDE |
| 1873 | 1874 | ** --unified Unified diff. ~DIFF_SIDEBYSIDE |
| 1875 | +** -w Ignore all whitespaces DIFF_IGNORE_EOLWS|DIFF_IGNORE_SOLWS | |
| 1874 | 1876 | ** --width|-W N N character lines. DIFF_WIDTH_MASK |
| 1875 | 1877 | */ |
| 1876 | 1878 | u64 diff_options(void){ |
| 1877 | 1879 | u64 diffFlags = 0; |
| 1878 | 1880 | const char *z; |
| 1879 | 1881 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -1865,14 +1865,16 @@ | |
| 1865 | ** --brief Show filenames only DIFF_BRIEF |
| 1866 | ** --context|-c N N lines of context. DIFF_CONTEXT_MASK |
| 1867 | ** --html Format for HTML DIFF_HTML |
| 1868 | ** --invert Invert the diff DIFF_INVERT |
| 1869 | ** --ignore-space-at-eol Ignore eol-whitespaces DIFF_IGNORE_EOLWS |
| 1870 | ** --linenum|-n Show line numbers DIFF_LINENO |
| 1871 | ** --noopt Disable optimization DIFF_NOOPT |
| 1872 | ** --side-by-side|-y Side-by-side diff. DIFF_SIDEBYSIDE |
| 1873 | ** --unified Unified diff. ~DIFF_SIDEBYSIDE |
| 1874 | ** --width|-W N N character lines. DIFF_WIDTH_MASK |
| 1875 | */ |
| 1876 | u64 diff_options(void){ |
| 1877 | u64 diffFlags = 0; |
| 1878 | const char *z; |
| 1879 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -1865,14 +1865,16 @@ | |
| 1865 | ** --brief Show filenames only DIFF_BRIEF |
| 1866 | ** --context|-c N N lines of context. DIFF_CONTEXT_MASK |
| 1867 | ** --html Format for HTML DIFF_HTML |
| 1868 | ** --invert Invert the diff DIFF_INVERT |
| 1869 | ** --ignore-space-at-eol Ignore eol-whitespaces DIFF_IGNORE_EOLWS |
| 1870 | ** --ignore-space-at-sol Ignore sol-whitespaces DIFF_IGNORE_SOLWS |
| 1871 | ** --linenum|-n Show line numbers DIFF_LINENO |
| 1872 | ** --noopt Disable optimization DIFF_NOOPT |
| 1873 | ** --side-by-side|-y Side-by-side diff. DIFF_SIDEBYSIDE |
| 1874 | ** --unified Unified diff. ~DIFF_SIDEBYSIDE |
| 1875 | ** -w Ignore all whitespaces DIFF_IGNORE_EOLWS|DIFF_IGNORE_SOLWS |
| 1876 | ** --width|-W N N character lines. DIFF_WIDTH_MASK |
| 1877 | */ |
| 1878 | u64 diff_options(void){ |
| 1879 | u64 diffFlags = 0; |
| 1880 | const char *z; |
| 1881 |
+1
-1
| --- src/diffcmd.c | ||
| +++ src/diffcmd.c | ||
| @@ -1102,11 +1102,11 @@ | ||
| 1102 | 1102 | */ |
| 1103 | 1103 | void diff_cmd(void){ |
| 1104 | 1104 | int isGDiff; /* True for gdiff. False for normal diff */ |
| 1105 | 1105 | int isInternDiff; /* True for internal diff */ |
| 1106 | 1106 | int verboseFlag; /* True if -v or --verbose flag is used */ |
| 1107 | - const char *zFrom; /* Source version number */ | |
| 1107 | + const char *zFrom; /* Source version number */ | |
| 1108 | 1108 | const char *zTo; /* Target version number */ |
| 1109 | 1109 | const char *zBranch; /* Branch to diff */ |
| 1110 | 1110 | const char *zDiffCmd = 0; /* External diff command. NULL for internal diff */ |
| 1111 | 1111 | const char *zBinGlob = 0; /* Treat file names matching this as binary */ |
| 1112 | 1112 | int fIncludeBinary = 0; /* Include binary files for external diff */ |
| 1113 | 1113 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -1102,11 +1102,11 @@ | |
| 1102 | */ |
| 1103 | void diff_cmd(void){ |
| 1104 | int isGDiff; /* True for gdiff. False for normal diff */ |
| 1105 | int isInternDiff; /* True for internal diff */ |
| 1106 | int verboseFlag; /* True if -v or --verbose flag is used */ |
| 1107 | const char *zFrom; /* Source version number */ |
| 1108 | const char *zTo; /* Target version number */ |
| 1109 | const char *zBranch; /* Branch to diff */ |
| 1110 | const char *zDiffCmd = 0; /* External diff command. NULL for internal diff */ |
| 1111 | const char *zBinGlob = 0; /* Treat file names matching this as binary */ |
| 1112 | int fIncludeBinary = 0; /* Include binary files for external diff */ |
| 1113 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -1102,11 +1102,11 @@ | |
| 1102 | */ |
| 1103 | void diff_cmd(void){ |
| 1104 | int isGDiff; /* True for gdiff. False for normal diff */ |
| 1105 | int isInternDiff; /* True for internal diff */ |
| 1106 | int verboseFlag; /* True if -v or --verbose flag is used */ |
| 1107 | const char *zFrom; /* Source version number */ |
| 1108 | const char *zTo; /* Target version number */ |
| 1109 | const char *zBranch; /* Branch to diff */ |
| 1110 | const char *zDiffCmd = 0; /* External diff command. NULL for internal diff */ |
| 1111 | const char *zBinGlob = 0; /* Treat file names matching this as binary */ |
| 1112 | int fIncludeBinary = 0; /* Include binary files for external diff */ |
| 1113 |