Fossil

Timeline
Login

Timeline

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

1 check-in for the month beginning 2023-03-01 by user mgagnon

Following month ↑
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)

Previous month ↓