| Thu, 03 Mar 2022 17:34:00 +0100 |
Gregory Szorc |
py2: remove simple from __future__ statements
|
| 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
|
| Sun, 10 Apr 2016 20:55:37 +0000 |
timeless |
pycompat: switch to util.stringio for py3 compat
|
| Thu, 08 Oct 2015 12:55:45 -0700 |
Pierre-Yves David |
error: get Abort from 'error' instead of 'util'
|
| Tue, 05 Aug 2014 14:56:25 -0700 |
Pierre-Yves David |
simplemerge: burn "minimal" feature to the ground
|
| Fri, 17 Aug 2012 13:58:19 -0700 |
timeless |
spelling: sentinel
|
| Fri, 06 Jan 2012 16:27:13 +0100 |
Martin Geisler |
Remove FSF mailing address from GPL headers
|
| Tue, 09 Feb 2010 14:12:22 -0600 |
Matt Mackall |
fix up a bunch of check-code warnings
|
| Mon, 25 Jan 2010 00:05:27 -0600 |
Matt Mackall |
many, many trivial check-code fixups
|
| Thu, 06 Mar 2008 22:23:41 +0100 |
Joel Rosdahl |
Remove unused imports
|
| Sun, 03 Feb 2008 19:29:05 -0600 |
Matt Mackall |
merge: move the bulk of simplemerge into core
|
| Tue, 19 Jun 2007 08:06:37 +0200 |
Thomas Arendsen Hein |
Cleanup of whitespace, indentation and line continuation.
|
| Wed, 06 Jun 2007 20:22:52 +0200 |
Thomas Arendsen Hein |
Removed trailing whitespace and tabs from python files
|
| Mon, 16 Apr 2007 20:17:39 -0300 |
Alexis S. L. Carvalho |
actually port simplemerge to hg
|
| Mon, 16 Apr 2007 20:17:39 -0300 |
Alexis S. L. Carvalho |
Import 3-way merge code from bzr
|
