| Wed, 18 Nov 2015 17:40:13 -0800 |
Siddharth Agarwal |
largefiles: fall back to the original for change/delete conflicts
|
| Sat, 14 Nov 2015 00:07:11 -0800 |
Siddharth Agarwal |
mergestate.add: store absentfilectxes as nullhex
|
| Fri, 20 Nov 2015 01:14:15 -0800 |
Siddharth Agarwal |
mergestate._resolve: handle change/delete conflicts
|
| Sat, 14 Nov 2015 00:00:46 -0800 |
Siddharth Agarwal |
filemerge: don't try to copy files known to be absent
|
| Sat, 31 Oct 2015 22:07:40 +0900 |
Yuya Nishihara |
hgweb: use absolute_import
|
| 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
|
| Fri, 13 Nov 2015 23:52:26 -0800 |
Siddharth Agarwal |
filemerge: add support for change/delete conflicts to the ':prompt' tool
|
| Wed, 18 Nov 2015 15:41:50 -0800 |
Siddharth Agarwal |
filemerge: add support for change/delete conflicts to the ':other' merge tool
|
| Wed, 18 Nov 2015 15:40:28 -0800 |
Siddharth Agarwal |
filemerge: add support for change/delete conflicts to the ':local' merge tool
|
