| Thu, 03 Mar 2022 17:34:00 +0100 |
Gregory Szorc |
py2: remove simple from __future__ statements
|
file |
diff |
annotate
|
| Mon, 07 Feb 2022 14:07:04 -0800 |
Martin von Zweigbergk |
simplemerge: remove now-unused arguments
|
file |
diff |
annotate
|
| Fri, 14 Jan 2022 08:17:13 -0800 |
Martin von Zweigbergk |
simplemerge: move printing of merge result to extension
|
file |
diff |
annotate
|
| Thu, 10 Feb 2022 13:36:09 -0800 |
Martin von Zweigbergk |
simplemerge: let extension check for binary inputs (unless `--text`)
|
file |
diff |
annotate
|
| Thu, 10 Feb 2022 09:59:07 -0800 |
Martin von Zweigbergk |
simplemerge: replace `**opts` passed to `simplemerge()` by keyword arguments
|
file |
diff |
annotate
|
| Thu, 20 Jan 2022 11:00:30 -0800 |
Martin von Zweigbergk |
simplemerge: take arguments as annotated context objects
|
file |
diff |
annotate
|
| Fri, 07 Jan 2022 23:29:19 -0800 |
Martin von Zweigbergk |
simplemerge: move default labels to simplemerge extension
|
file |
diff |
annotate
|
| Tue, 14 Dec 2021 13:12:56 -0800 |
Martin von Zweigbergk |
simplemerge: use 3-way markers if mode=='merge3', ignoring number of labels
|
file |
diff |
annotate
|
| Fri, 06 Nov 2020 13:58:59 -0800 |
Gregory Szorc |
global: use python3 in shebangs
|
file |
diff |
annotate
|
| Mon, 06 Jul 2020 17:44:25 +0200 |
Manuel Jacob |
pycompat: change users of pycompat.{stdin,stdout,stderr} to use procutil.std*
|
file |
diff |
annotate
|
| Thu, 14 Nov 2019 20:35:11 -0800 |
Gregory Szorc |
black: blacken scripts
|
file |
diff |
annotate
|
| Fri, 01 Nov 2019 17:23:02 +0100 |
Emmanuel Leblond |
py3: fix exception display encoding in contrib/simplemerge.py
stable
|
file |
diff |
annotate
|
| Sat, 13 Oct 2018 16:57:28 +0200 |
Yuya Nishihara |
py3: convert "usage" literal to bytes
|
file |
diff |
annotate
|
| Sat, 13 Oct 2018 08:54:44 -0400 |
Augie Fackler |
simplemerge: port to Python 3
|
file |
diff |
annotate
|
| Mon, 24 Sep 2018 00:00:04 +0300 |
Pulkit Goyal |
py3: use pycompat.strkwargs() in contrib/simplemerge
|
file |
diff |
annotate
|