| Fri, 14 Jan 2022 08:44:36 -0800 |
Martin von Zweigbergk |
simplemerge: delete unused exception class `CantReprocessAndShowBase`
|
| Tue, 11 Jan 2022 21:56:27 -0800 |
Martin von Zweigbergk |
simplemerge: simplify and rename `render_markers()`
|
| Tue, 11 Jan 2022 16:54:42 -0800 |
Martin von Zweigbergk |
simplemerge: clarify names of functions that render conflict markers
|
| Fri, 07 Jan 2022 22:16:22 -0800 |
Martin von Zweigbergk |
simplemerge: make merge_lines() a free function
|
| Fri, 07 Jan 2022 18:42:31 -0800 |
Martin von Zweigbergk |
simplemerge: convert `merge_lines()` away from generator
|
| Thu, 06 Jan 2022 09:03:17 -0800 |
Martin von Zweigbergk |
simplemerge: make merge_groups() yield only 2-tuples
|
| Mon, 18 Jan 2021 22:32:09 -0800 |
Martin von Zweigbergk |
simplemerge: delete unused find_unconflicted()
|
| Sun, 06 Oct 2019 09:45:02 -0400 |
Augie Fackler |
formatting: blacken the codebase
|
| Sun, 29 Sep 2019 12:34:52 -0700 |
Gregory Szorc |
tests: use silenttestrunner in test-simplemerge.py
|
| Mon, 09 Jul 2018 15:33:49 -0700 |
Danny Hooper |
tests: prevent conflict markers in test case from triggering warnings
|
| Fri, 27 Apr 2018 10:17:48 -0400 |
Augie Fackler |
tests: port test-simplemerge.py to Python 3
|
| Fri, 27 Apr 2018 10:21:24 -0400 |
Augie Fackler |
tests: replace use of assertEquals with assertEqual in test-simplemerge.py
|
| Thu, 22 Mar 2018 21:56:20 +0900 |
Yuya Nishihara |
stringutil: bulk-replace call sites to point to new module
|
| Sat, 13 May 2017 11:52:44 -0700 |
Gregory Szorc |
tests: use context manager form of assertRaises
|
| Sat, 16 Apr 2016 02:59:36 +0530 |
Pulkit Goyal |
tests: make test-simplemerge use absolute_import
|
