| 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
|
