Thu, 26 Oct 2017 11:07:06 -0700 |
Kostia Balytskyi |
filemerge: pass a default value to _toolstr (issue5718)
stable
|
Fri, 20 Oct 2017 14:15:46 -0700 |
Joe Blaylock |
help: fix typo in hg merge documentation
stable
|
Sun, 08 Oct 2017 20:37:13 +0200 |
Boris Feld |
configitems: register the full 'merge-tools' config and sub-options
|
Fri, 06 Oct 2017 06:48:43 -0700 |
Ryan McElroy |
merge: allow user to halt merge on merge-tool failures
|
Fri, 06 Oct 2017 06:48:43 -0700 |
Ryan McElroy |
filemerge: introduce functions to halt merge flow
|
Sun, 15 Oct 2017 20:36:29 -0700 |
Phil Cohen |
filemerge: add a missing flushall()
|
Fri, 13 Oct 2017 12:34:22 -0700 |
Phil Cohen |
filemerge: store backups in the overlayworkingctx if using imm
|
Mon, 16 Oct 2017 13:10:55 -0700 |
Phil Cohen |
filemerge: use arbitraryfilectx for backups
|
Mon, 02 Oct 2017 04:48:06 +0530 |
Pulkit Goyal |
py3: use '%d' for integers instead of '%s'
|
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
|
Fri, 14 Jul 2017 14:22:40 -0700 |
Jun Wu |
codemod: register core configitems using a script
|
Mon, 26 Jun 2017 22:52:15 -0700 |
Phil Cohen |
filemerge: convert a couple of wvfs calls in internal mergetools to contexts
|
Sat, 22 Apr 2017 19:56:47 +0900 |
Yuya Nishihara |
templater: add simple interface for unnamed template (API)
|
Fri, 02 Jun 2017 16:57:21 +0530 |
Pulkit Goyal |
py3: convert bool variables to bytes
|
Fri, 19 May 2017 03:47:43 -0700 |
Stanislau Hlebik |
filemerge: store error messages in module variables
|
Sat, 13 May 2017 03:31:42 +0900 |
FUJIWARA Katsunori |
filemerge: add internal merge tool to dump files forcibly
|
Sat, 13 May 2017 03:28:36 +0900 |
FUJIWARA Katsunori |
filemerge: make warning message more i18n friendly
|