Fri, 19 Jan 2018 19:07:58 -0800 |
Kyle Lippincott |
filemerge: use a single temp dir instead of temp files
|
Fri, 19 Jan 2018 19:14:09 -0800 |
Kyle Lippincott |
filemerge: move temp file unlinks to _maketempfiles
|
Sat, 17 Mar 2018 11:23:04 +0900 |
Yuya Nishihara |
templater: rename .render(mapping) to .renderdefault(mapping) (API)
|
Fri, 19 Jan 2018 18:52:50 -0800 |
Kyle Lippincott |
filemerge: give some variables in _xmerge more descriptive names
|
Sat, 10 Mar 2018 15:57:16 +0900 |
Yuya Nishihara |
py3: use r'' instead of sysstr('') to get around code transformer
|
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
|
Fri, 22 Dec 2017 21:22:49 +0900 |
Yuya Nishihara |
templater: drop unneeded resources from conflict-marker data
|