Wed, 05 Jan 2022 11:34:54 -0800 |
Martin von Zweigbergk |
simplemerge: rewrite `merge_lines()` using `merge_groups()`
|
Thu, 06 Jan 2022 09:03:17 -0800 |
Martin von Zweigbergk |
simplemerge: make merge_groups() yield only 2-tuples
|
Tue, 07 Dec 2021 23:01:20 -0800 |
Martin von Zweigbergk |
simplemerge: don't calculate conflict labels when resolving automatically
|
Tue, 07 Dec 2021 22:45:31 -0800 |
Martin von Zweigbergk |
simplemerge: remove now-unused `localorother` argument from `merge_lines()`
|
Tue, 07 Dec 2021 22:33:18 -0800 |
Martin von Zweigbergk |
simplemerge: add a specialized function for "union", "local", "other"
|
Tue, 07 Dec 2021 17:48:50 -0800 |
Martin von Zweigbergk |
simplemerge: make `localorother` a "mode" instead of a separate thing
|
Tue, 07 Dec 2021 14:11:58 -0800 |
Martin von Zweigbergk |
simplemerge: avoid a call to `pycompat.strkwargs()`
|
Mon, 06 Dec 2021 23:17:43 -0800 |
Martin von Zweigbergk |
simplemerge: stop merging file flags
|
Mon, 29 Nov 2021 23:00:29 -0800 |
Martin von Zweigbergk |
simplemerge: set `conflicts` earlier for :union tool
|
Tue, 30 Mar 2021 02:32:30 +0200 |
Joerg Sonnenberger |
refactor: prefer checks against nullrev over nullid
|
Mon, 18 Jan 2021 22:32:09 -0800 |
Martin von Zweigbergk |
simplemerge: delete unused find_unconflicted()
|
Tue, 01 Dec 2020 21:54:46 +0100 |
Joerg Sonnenberger |
node: import symbols explicitly
|
Tue, 08 Dec 2020 16:45:13 -0800 |
Martin von Zweigbergk |
mergetools: add new conflict marker format with diffs in
|
Wed, 09 Dec 2020 00:00:19 -0800 |
Martin von Zweigbergk |
simplemerge: write output only once it's complete
|
Tue, 08 Dec 2020 23:05:53 -0800 |
Martin von Zweigbergk |
simplemerge: avoid quadratic concatenation when building output text
|
Tue, 08 Dec 2020 22:59:17 -0800 |
Martin von Zweigbergk |
simplemerge: work with opts as native strings instead of bytes
|
Fri, 27 Nov 2020 17:03:29 -0500 |
Augie Fackler |
formating: upgrade to black 20.8b1
|
Tue, 02 Jun 2020 21:44:57 +0900 |
Yuya Nishihara |
simplemerge: rewrite flag merging loop as expression
|
Tue, 02 Jun 2020 21:40:49 +0900 |
Yuya Nishihara |
simplemerge: leverage pycompat function to convert byte string to set
|
Tue, 02 Jun 2020 21:39:07 +0900 |
Yuya Nishihara |
simplemerge: fix function name that tests if ctx is not null revision
|
Sat, 16 May 2020 20:38:19 +0200 |
Pierre-Yves David |
flags: actually merge flags in simplemerge
stable
|
Wed, 06 Nov 2019 15:42:30 -0500 |
Augie Fackler |
simplemerge: disable a pytype error where it's just confused
|
Sun, 06 Oct 2019 09:48:39 -0400 |
Augie Fackler |
formatting: byteify all mercurial/ and hgext/ string literals
|
Sun, 06 Oct 2019 09:45:02 -0400 |
Augie Fackler |
formatting: blacken the codebase
|
Wed, 20 Feb 2019 19:28:51 -0500 |
Augie Fackler |
cleanup: use () to wrap long lines instead of \
|
Wed, 01 Aug 2018 13:00:45 -0700 |
Gregory Szorc |
global: use pycompat.xrange()
|
Thu, 22 Mar 2018 21:56:20 +0900 |
Yuya Nishihara |
stringutil: bulk-replace call sites to point to new module
|
Sun, 10 Dec 2017 04:48:24 +0530 |
Pulkit Goyal |
py3: handle keyword arguments correctly in simplemerge.py
|
Fri, 01 Sep 2017 10:35:43 -0700 |
Phil Cohen |
simplemerge: remove unused `repo` parameter
|
Fri, 25 Aug 2017 13:49:17 -0700 |
Phil Cohen |
simplemerge: refactor _picklabels to be more compact
|