| 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 21:17:18 -0800 |
Martin von Zweigbergk |
filemerge: stop returning always-`True` value
|
| Mon, 06 Dec 2021 13:43:00 -0800 |
Martin von Zweigbergk |
filemerge: remove unused `orig` argument from tool functions
|
| Mon, 06 Dec 2021 12:48:01 -0800 |
Martin von Zweigbergk |
filemerge: stop passing around 3 unused `None` values in `files` argument
|
| Mon, 06 Dec 2021 13:15:40 -0800 |
Martin von Zweigbergk |
filemerge: rename backup variables from `back` to `backup`
|
| Tue, 14 Dec 2021 13:41:34 -0800 |
Martin von Zweigbergk |
filemerge: remove leftover documentation of removed argument
|
| Mon, 06 Dec 2021 12:30:54 -0800 |
Martin von Zweigbergk |
filemerge: remove `premerge` argument from `_makebackup()`
|
| Fri, 03 Dec 2021 22:45:35 -0800 |
Martin von Zweigbergk |
filemerge: inline `_filemerge()` into `filemerge()`
|
| Fri, 03 Dec 2021 21:41:43 -0800 |
Martin von Zweigbergk |
filemerge: make `_filemerge()` do both premerge and merge
|
| Fri, 03 Dec 2021 16:21:46 -0800 |
Martin von Zweigbergk |
filemerge: merge `premerge()` into `filemerge()`
|
| Fri, 19 Nov 2021 18:48:34 -0800 |
Martin von Zweigbergk |
filemerge: simplify slightly by using filectx.decodeddata()
|
| Fri, 19 Nov 2021 18:14:25 -0800 |
Martin von Zweigbergk |
filemerge: rename _formatconflictmarker() since it formats a label
|
| Tue, 07 Sep 2021 11:50:12 -0700 |
Kyle Lippincott |
filemerge: be more strict when detecting conflict markers, add `|` markers
stable
|
| Mon, 29 Mar 2021 01:52:06 +0200 |
Joerg Sonnenberger |
node: replace nullid and friends with nodeconstants class
|
| Thu, 25 Mar 2021 18:02:08 +0100 |
Raphaël Gomès |
contributor: change mentions of mpm to olivia
|
