Thus said Jan Nijtmans on Thu, 07 Nov 2013 12:41:01 +0100: > I merged the "url-password-fixes" and the "jan-httpsproxytunnel" > branched together, and did various tests using https over a http > tunnel. This confirmed what I already guessed: The merge of those two > branches didn't have any conflicts, and everything works fine.
Are you suggesting that it's safe for me to merge the url-password-fixes branch into trunk, or are you saying you have already done so? If the latter, I don't see it here: https://www.fossil-scm.org/index.html/timeline?n=20&y=ci If the former, I'll go ahead and merge using the --integrate option. Andy -- TAI64 timestamp: 40000000527bb487 _______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
