Yuya Nishihara <yuya@tcha.org> [Sun, 01 Nov 2015 15:09:35 +0900] rev 27045
hgweb: import wsgicgi at top level
There should be no practical reason to delay the import of wsgicgi.
Yuya Nishihara <yuya@tcha.org> [Sun, 01 Nov 2015 15:07:08 +0900] rev 27044
hgweb: import BaseHTTPServer as module at top level
This will avoid future warning spotted by the import checker.
Yuya Nishihara <yuya@tcha.org> [Sun, 01 Nov 2015 14:23:23 +0900] rev 27043
hgweb: do not import hgweb_mod.hgweb and .makebreadcrumb as symbol
It will be enforced by the import checker.
Siddharth Agarwal <sid0@fb.com> [Fri, 13 Nov 2015 23:57:43 -0800] rev 27042
filemerge: don't try using external tools on change/delete conflicts
This is mostly for completeness' sake -- the current code shouldn't get to this
point.
Siddharth Agarwal <sid0@fb.com> [Fri, 13 Nov 2015 23:56:00 -0800] rev 27041
filemerge: don't attempt to premerge change/delete conflicts
This is mostly for completeness' sake -- at the moment we don't support any
tools for change/delete conflicts that would do a premerge.
Siddharth Agarwal <sid0@fb.com> [Fri, 13 Nov 2015 23:58:05 -0800] rev 27040
filemerge._mergecheck: add check for change/delete conflicts
Merge tools that perform an actual 3-way merge can't handle change/delete
conflicts. This adds a check for that.