Fossil SCM
[c541b6e734] Correct merge
dave.vines
2016-01-02 10:49
Commit
85aa2a6f766420cf3ff10a015da64d896d01255f
Parent
b208bf75777604d…
1 file changed
+2
-2
+2
-2
| --- src/wiki.c | ||
| +++ src/wiki.c | ||
| @@ -1163,12 +1163,12 @@ | ||
| 1163 | 1163 | ** to be created or updated. |
| 1164 | 1164 | ** --technote-tags TAGS The set of tags for a technote. |
| 1165 | 1165 | ** --technote-bgcolor COLOR The color used for the technote on the |
| 1166 | 1166 | ** timeline. |
| 1167 | 1167 | ** |
| 1168 | -** %fossil wiki list ?-technote? | |
| 1169 | -** %fossil wiki ls ?-technote? | |
| 1168 | +** %fossil wiki list ?--technote? | |
| 1169 | +** %fossil wiki ls ?--technote? | |
| 1170 | 1170 | ** |
| 1171 | 1171 | ** Lists all wiki entries, one per line, ordered |
| 1172 | 1172 | ** case-insensitively by name. The --technote flag |
| 1173 | 1173 | ** specifies that technotes will be listed instead of |
| 1174 | 1174 | ** the wiki entries, which will be listed in order |
| 1175 | 1175 |
| --- src/wiki.c | |
| +++ src/wiki.c | |
| @@ -1163,12 +1163,12 @@ | |
| 1163 | ** to be created or updated. |
| 1164 | ** --technote-tags TAGS The set of tags for a technote. |
| 1165 | ** --technote-bgcolor COLOR The color used for the technote on the |
| 1166 | ** timeline. |
| 1167 | ** |
| 1168 | ** %fossil wiki list ?-technote? |
| 1169 | ** %fossil wiki ls ?-technote? |
| 1170 | ** |
| 1171 | ** Lists all wiki entries, one per line, ordered |
| 1172 | ** case-insensitively by name. The --technote flag |
| 1173 | ** specifies that technotes will be listed instead of |
| 1174 | ** the wiki entries, which will be listed in order |
| 1175 |
| --- src/wiki.c | |
| +++ src/wiki.c | |
| @@ -1163,12 +1163,12 @@ | |
| 1163 | ** to be created or updated. |
| 1164 | ** --technote-tags TAGS The set of tags for a technote. |
| 1165 | ** --technote-bgcolor COLOR The color used for the technote on the |
| 1166 | ** timeline. |
| 1167 | ** |
| 1168 | ** %fossil wiki list ?--technote? |
| 1169 | ** %fossil wiki ls ?--technote? |
| 1170 | ** |
| 1171 | ** Lists all wiki entries, one per line, ordered |
| 1172 | ** case-insensitively by name. The --technote flag |
| 1173 | ** specifies that technotes will be listed instead of |
| 1174 | ** the wiki entries, which will be listed in order |
| 1175 |