log mercurial/filemerge.py @ 36424:3ab9d74dd1c5

age author description
Sun, 25 Feb 2018 23:09:58 -0500 Augie Fackler filemerge: do what the context __bytes__ does, but locally
Wed, 17 Jan 2018 17:35:05 -0800 Kyle Lippincott filemerge: support passing labels to external merge tools
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