Fossil

Check-in Differences
Login

Check-in Differences

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Difference From 68e9acb8360510a4 To 04e1674c75b1cb4f

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)
2023-03-17
11:50
CSS tweaks for the Blitz and Aroise skins to make it more apparent when Submit buttons are disabled. Based on forum post 4cbd254480d00dd2. ... (check-in: c0f62386 user: stephan 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)

2023-03-15
12:42
A blitz skin forum CSS tweak from 224044aa2d8d2 to give visited links in the thread list a slightly different color. ... (check-in: 68e9acb8 user: stephan tags: trunk)
10:40
(x)diff --context N, where N is a negative value, is now treated as infinite, per off-list feature request. ... (check-in: 16d3d8b0 user: stephan tags: trunk)

Changes to src/merge.c.