Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Improved documentation for the --cherrypick and --backout options of the "fossil merge" command. |
|---|---|
| Downloads: | Tarball | ZIP archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
29a383e4b6c36c81a0b087fd86d2ec20 |
| User & Date: | drh 2019-10-16 17:44:44.706 |
Context
|
2019-10-21
| ||
| 01:53 | Replaced brief footnote in fossil-v-git doc explaining why we use JavaScript (sparingly) with a reference to the new javascript.md doc, which explains this much more fully. ... (check-in: 21c7f1f8a3 user: wyoung tags: trunk) | |
|
2019-10-16
| ||
| 17:44 | Improved documentation for the --cherrypick and --backout options of the "fossil merge" command. ... (check-in: 29a383e4b6 user: drh tags: trunk) | |
|
2019-10-12
| ||
| 22:39 | Updates to windows server documenttion to include examples of winsrv command. ... (check-in: 6a0ec82bae user: ckennedy tags: trunk) | |
Changes
Changes to src/merge.c.