| Mon, 11 Sep 2017 13:03:27 -0700 |
Phil Cohen |
filemerge: flush if using deferred writes when running a merge tool
|
| Mon, 11 Sep 2017 13:03:27 -0700 |
Phil Cohen |
merge: pass wctx to premerge, filemerge
|
| Tue, 05 Sep 2017 12:04:02 -0700 |
Phil Cohen |
filemerge: use fctx.write() in the internal:dump tool, instead of copy
|
| Fri, 01 Sep 2017 10:35:43 -0700 |
Phil Cohen |
simplemerge: remove unused `repo` parameter
|
| Thu, 31 Aug 2017 11:28:59 -0700 |
Phil Cohen |
filemerge: add _restorebackup
|
| Thu, 31 Aug 2017 11:28:59 -0700 |
Phil Cohen |
filemerge: reduce creation of tempfiles until needed
|
| Thu, 31 Aug 2017 11:28:59 -0700 |
Phil Cohen |
filemerge: add `_workingpath`
|
| Thu, 31 Aug 2017 11:28:59 -0700 |
Phil Cohen |
filemerge: move a util copy call to filectx.write
|
| Thu, 31 Aug 2017 11:28:59 -0700 |
Phil Cohen |
filemerge: eliminate most uses of tempfiles
|
| Thu, 31 Aug 2017 11:05:19 -0700 |
Phil Cohen |
filemerge: extract _maketemp and _makebackup
|
| Thu, 24 Aug 2017 21:30:51 -0700 |
Phil Cohen |
simplemerge: stop accepting, and passing, file parameters
|
| Sun, 13 Aug 2017 20:06:52 -0700 |
Phil Cohen |
filemerge: pass contexts to simplemerge
|
| Sun, 06 Aug 2017 01:13:57 +0900 |
FUJIWARA Katsunori |
filemerge: move decorator definition for internal merge tools to registrar
|
| Fri, 30 Jun 2017 03:44:56 +0200 |
Boris Feld |
configitems: register the 'ui.mergemarkertemplate' config
|
