Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch merge-conflict-when-no-file-on-pivot Excluding Merge-Ins
This is equivalent to a diff from 3783a24e to 88a76afc
|
2023-04-19
| ||
| 01:46 | Produce merge conflict mark during merge when file exist in current version and in version to be merged, but not in common ancestor. ... (check-in: 7c75e47b user: mgagnon tags: trunk) | |
|
2023-04-18
| ||
| 17:47 | Extend FTS index support to enable selection of different tokenizers, to support searching of Chinese content. ... (check-in: 0e5d27fe user: stephan tags: trunk) | |
|
2023-04-17
| ||
| 21:50 | Merge latest changes from trunk. ... (Closed-Leaf check-in: 88a76afc user: mgagnon tags: merge-conflict-when-no-file-on-pivot) | |
| 17:25 | Initial (and incomplete) work to extend FTS5 search to support the trigram tokenizer, per forum post bc458aea069c29ae5d. TODO is the addition of the trigram option in the UI-level search configuration. ... (check-in: 06c99b83 user: stephan tags: fts5-trigram) | |
|
2023-04-16
| ||
| 13:13 | Merge trunk into forumpost-locking branch. ... (check-in: 0af37104 user: stephan tags: forumpost-locking) | |
|
2023-04-14
| ||
| 15:31 | Squelch an unitialized var warning from gcc 12.2.1 on Alpine Linux. ... (check-in: 3783a24e user: stephan tags: trunk) | |
|
2023-04-13
| ||
| 07:01 | Typo fix in capabilities.c, reported in forum. ... (check-in: 0df0586a user: danield tags: trunk) | |
|
2023-03-16
| ||
| 02:08 |
Produce merge conflict mark during merge when file exist in current version
and in version to be merged, but not in common ancestor.
Related forum discussion including test script: f035bbc8461da6d2. ... (check-in: 04e1674c user: mgagnon tags: merge-conflict-when-no-file-on-pivot) | |
Changes to src/merge.c.