Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
5 check-ins tagged with "bad-merge"
|
2020-08-16
| ||
| 15:49 | Fixed a recursion bug in fossil.dom.append(e,array) (currently unused, but will be soon). Closed-Leaf check-in: 154f6484b6 user: stephan tags: bad-merge | |
| 15:47 | Disable HTTPS redirect for the "test-http" command. That command is used by the "ssh:" transport method and redirects to https will break ssh: transport. check-in: edf63d73c5 user: drh tags: bad-merge | |
| 15:30 | Close multi-remote-fix branch because the issue is now resolved. See https://fossil-scm.org/forum/forumpost/158a67cc53 for some information on what was going on. The solution was to reopen the configuration after it was being prematurely closed. check-in: 4c16a24995 user: andygoth tags: bad-merge | |
|
2019-05-18
| ||
| 20:55 | Merge the windows build fix from trunk. Closed-Leaf check-in: d99debe8ee user: drh tags: bad-merge | |
| 20:50 | Check-in [344a3331d34d896776] breaks the build when using openssl-1.0.1 so back it out for now. (Added:) The content is correct, but this check-in shows an unexpected merge. I don't know yet if the extra merge is a bug in fossil or a PBKAC. This check-in was originally to trunk but is now moved to a branch. check-in: 8ac66ef33b user: drh tags: bad-merge | |