Mercurial > hg
log
age | author | description |
---|---|---|
Sun, 01 Nov 2015 15:09:35 +0900 | Yuya Nishihara | hgweb: import wsgicgi at top level |
Sun, 01 Nov 2015 15:07:08 +0900 | Yuya Nishihara | hgweb: import BaseHTTPServer as module at top level |
Sun, 01 Nov 2015 14:23:23 +0900 | Yuya Nishihara | hgweb: do not import hgweb_mod.hgweb and .makebreadcrumb as symbol |
Fri, 13 Nov 2015 23:57:43 -0800 | Siddharth Agarwal | filemerge: don't try using external tools on change/delete conflicts |
Fri, 13 Nov 2015 23:56:00 -0800 | Siddharth Agarwal | filemerge: don't attempt to premerge change/delete conflicts |
Fri, 13 Nov 2015 23:58:05 -0800 | Siddharth Agarwal | filemerge._mergecheck: add check for change/delete conflicts |
Sun, 15 Nov 2015 21:40:15 -0800 | Siddharth Agarwal | filemerge._picktool: only pick from nomerge tools for change/delete conflicts |