log mercurial/filemerge.py @ 35829:c87926ebe096

age author description
Wed, 17 Jan 2018 20:09:52 -0500 Augie Fackler filemerge: fix regular expression pattern to be bytes
Thu, 04 Jan 2018 21:37:03 -0800 Phil Cohen filemerge: only write in-memory backup during premerge
Thu, 04 Jan 2018 21:36:58 -0800 Phil Cohen filemerge: fix backing up an in-memory file to a custom location
Fri, 22 Dec 2017 21:19:29 +0900 Yuya Nishihara templater: register keywords to defaults table
Fri, 22 Dec 2017 21:22:49 +0900 Yuya Nishihara templater: drop unneeded resources from conflict-marker data
Thu, 21 Dec 2017 22:05:30 +0900 Yuya Nishihara templater: move repo, ui and cache to per-engine resources
Wed, 20 Dec 2017 17:22:16 -0600 Phil Cohen filemerge: only raise InMemoryMergeConflictsError when running _xmerge
Fri, 01 Dec 2017 00:07:23 -0800 Phil Cohen filemerge: raise InMemoryMergeConflictsError if we hit merge conflicts in IMM
Fri, 01 Dec 2017 00:07:23 -0800 Phil Cohen context: switch ctx() use to changectx()
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