| Thu, 26 Jul 2018 17:11:03 -0700 |
Kyle Lippincott |
resolve: add option to warn/abort on -m with unresolved conflict markers
|
file |
diff |
annotate
|
| Sat, 26 May 2018 12:20:36 +0900 |
Yuya Nishihara |
py3: wrap tempfile.mkdtemp() to use bytes path
|
file |
diff |
annotate
|
| Sat, 26 May 2018 12:14:04 +0900 |
Yuya Nishihara |
py3: wrap tempfile.mkstemp() to use bytes path
|
file |
diff |
annotate
|
| Thu, 24 May 2018 15:56:47 -0600 |
hindlemail |
filemerge: don't pass function name as loadpath's module_name param
|
file |
diff |
annotate
|
| Wed, 16 May 2018 14:11:41 -0600 |
hindlemail |
filemerge: support specifying a python function to custom merge-tools
|
file |
diff |
annotate
|
| Sat, 24 Mar 2018 15:10:51 +0900 |
Yuya Nishihara |
procutil: bulk-replace function calls to point to new module
|
file |
diff |
annotate
|
| Thu, 22 Mar 2018 21:56:20 +0900 |
Yuya Nishihara |
stringutil: bulk-replace call sites to point to new module
|
file |
diff |
annotate
|
| Wed, 21 Mar 2018 12:36:29 -0700 |
Kyle Lippincott |
filemerge: make the 'local' path match the format that 'base' and 'other' use
|
file |
diff |
annotate
|
| Fri, 19 Jan 2018 19:07:58 -0800 |
Kyle Lippincott |
filemerge: use a single temp dir instead of temp files
|
file |
diff |
annotate
|
| Fri, 19 Jan 2018 19:14:09 -0800 |
Kyle Lippincott |
filemerge: move temp file unlinks to _maketempfiles
|
file |
diff |
annotate
|
| Sat, 17 Mar 2018 11:23:04 +0900 |
Yuya Nishihara |
templater: rename .render(mapping) to .renderdefault(mapping) (API)
|
file |
diff |
annotate
|
| Fri, 19 Jan 2018 18:52:50 -0800 |
Kyle Lippincott |
filemerge: give some variables in _xmerge more descriptive names
|
file |
diff |
annotate
|
| Sat, 10 Mar 2018 15:57:16 +0900 |
Yuya Nishihara |
py3: use r'' instead of sysstr('') to get around code transformer
|
file |
diff |
annotate
|
| Sun, 25 Feb 2018 23:09:58 -0500 |
Augie Fackler |
filemerge: do what the context __bytes__ does, but locally
|
file |
diff |
annotate
|
| Wed, 17 Jan 2018 17:35:05 -0800 |
Kyle Lippincott |
filemerge: support passing labels to external merge tools
|
file |
diff |
annotate
|
| Wed, 17 Jan 2018 20:09:52 -0500 |
Augie Fackler |
filemerge: fix regular expression pattern to be bytes
|
file |
diff |
annotate
|
| Thu, 04 Jan 2018 21:37:03 -0800 |
Phil Cohen |
filemerge: only write in-memory backup during premerge
|
file |
diff |
annotate
|
| Thu, 04 Jan 2018 21:36:58 -0800 |
Phil Cohen |
filemerge: fix backing up an in-memory file to a custom location
|
file |
diff |
annotate
|
| Fri, 22 Dec 2017 21:19:29 +0900 |
Yuya Nishihara |
templater: register keywords to defaults table
|
file |
diff |
annotate
|
| Fri, 22 Dec 2017 21:22:49 +0900 |
Yuya Nishihara |
templater: drop unneeded resources from conflict-marker data
|
file |
diff |
annotate
|
| Thu, 21 Dec 2017 22:05:30 +0900 |
Yuya Nishihara |
templater: move repo, ui and cache to per-engine resources
|
file |
diff |
annotate
|
| Wed, 20 Dec 2017 17:22:16 -0600 |
Phil Cohen |
filemerge: only raise InMemoryMergeConflictsError when running _xmerge
|
file |
diff |
annotate
|
| Fri, 01 Dec 2017 00:07:23 -0800 |
Phil Cohen |
filemerge: raise InMemoryMergeConflictsError if we hit merge conflicts in IMM
|
file |
diff |
annotate
|
| Fri, 01 Dec 2017 00:07:23 -0800 |
Phil Cohen |
context: switch ctx() use to changectx()
|
file |
diff |
annotate
|
| Thu, 26 Oct 2017 11:07:06 -0700 |
Kostia Balytskyi |
filemerge: pass a default value to _toolstr (issue5718)
stable
|
file |
diff |
annotate
|
| Fri, 20 Oct 2017 14:15:46 -0700 |
Joe Blaylock |
help: fix typo in hg merge documentation
stable
|
file |
diff |
annotate
|
| Sun, 08 Oct 2017 20:37:13 +0200 |
Boris Feld |
configitems: register the full 'merge-tools' config and sub-options
|
file |
diff |
annotate
|
| Fri, 06 Oct 2017 06:48:43 -0700 |
Ryan McElroy |
merge: allow user to halt merge on merge-tool failures
|
file |
diff |
annotate
|
| Fri, 06 Oct 2017 06:48:43 -0700 |
Ryan McElroy |
filemerge: introduce functions to halt merge flow
|
file |
diff |
annotate
|
| Sun, 15 Oct 2017 20:36:29 -0700 |
Phil Cohen |
filemerge: add a missing flushall()
|
file |
diff |
annotate
|