Wed, 29 Aug 2018 22:53:44 -0400 |
Matt Harbison |
filemerge: fix an i18n comment typo
|
Sun, 26 Aug 2018 19:14:26 +0300 |
Pulkit Goyal |
filemerge: fix the wrong placements of messages in prompt
|
Sat, 25 Aug 2018 21:17:34 +0300 |
Pulkit Goyal |
filemerge: print the filename in quotes in prompt
|
Mon, 20 Aug 2018 13:29:48 -0400 |
Augie Fackler |
merge: improve interactive one-changed one-deleted message (issue5550)
|
Wed, 22 Aug 2018 14:08:27 +0900 |
FUJIWARA Katsunori |
filemerge: avoid putting translated text into docstring
|
Wed, 22 Aug 2018 13:57:01 +0900 |
FUJIWARA Katsunori |
filemerge: make capability check for internal tools ignore merge-tools section
|
Tue, 14 Aug 2018 22:20:28 +0900 |
FUJIWARA Katsunori |
filemerge: show actual capabilities of internal merge tools
|
Wed, 15 Aug 2018 22:24:50 +0900 |
FUJIWARA Katsunori |
filemerge: add config knob to check capabilities of internal merge tools
|
Wed, 15 Aug 2018 22:24:38 +0900 |
FUJIWARA Katsunori |
filemerge: show warning if chosen tool has no binary files capability
|
Tue, 14 Aug 2018 20:15:51 +0900 |
FUJIWARA Katsunori |
filemerge: add the function to examine a capability of a internal tool
|
Tue, 14 Aug 2018 20:08:27 +0900 |
FUJIWARA Katsunori |
filemerge: set actual capabilities of internal merge tools
|
Mon, 23 Jul 2018 22:51:53 -0700 |
Martin von Zweigbergk |
mergetool: warn if ui.merge points to nonexistent tool
|
Thu, 26 Jul 2018 17:11:03 -0700 |
Kyle Lippincott |
resolve: add option to warn/abort on -m with unresolved conflict markers
|
Sat, 26 May 2018 12:20:36 +0900 |
Yuya Nishihara |
py3: wrap tempfile.mkdtemp() to use bytes path
|
Sat, 26 May 2018 12:14:04 +0900 |
Yuya Nishihara |
py3: wrap tempfile.mkstemp() to use bytes path
|
Thu, 24 May 2018 15:56:47 -0600 |
hindlemail |
filemerge: don't pass function name as loadpath's module_name param
|
Wed, 16 May 2018 14:11:41 -0600 |
hindlemail |
filemerge: support specifying a python function to custom merge-tools
|
Sat, 24 Mar 2018 15:10:51 +0900 |
Yuya Nishihara |
procutil: bulk-replace function calls to point to new module
|
Thu, 22 Mar 2018 21:56:20 +0900 |
Yuya Nishihara |
stringutil: bulk-replace call sites to point to new module
|
Wed, 21 Mar 2018 12:36:29 -0700 |
Kyle Lippincott |
filemerge: make the 'local' path match the format that 'base' and 'other' use
|
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
|