Mercurial > hg
log contrib/simplemerge @ 51919:ceaf92d6d380 default tip
| age | author | description |
|---|---|---|
| Thu, 03 Mar 2022 17:34:00 +0100 | Gregory Szorc | py2: remove simple from __future__ statements |
| Mon, 07 Feb 2022 14:07:04 -0800 | Martin von Zweigbergk | simplemerge: remove now-unused arguments |
| Fri, 14 Jan 2022 08:17:13 -0800 | Martin von Zweigbergk | simplemerge: move printing of merge result to extension |
| Thu, 10 Feb 2022 13:36:09 -0800 | Martin von Zweigbergk | simplemerge: let extension check for binary inputs (unless `--text`) |
| Thu, 10 Feb 2022 09:59:07 -0800 | Martin von Zweigbergk | simplemerge: replace `**opts` passed to `simplemerge()` by keyword arguments |
| Thu, 20 Jan 2022 11:00:30 -0800 | Martin von Zweigbergk | simplemerge: take arguments as annotated context objects |
| Fri, 07 Jan 2022 23:29:19 -0800 | Martin von Zweigbergk | simplemerge: move default labels to simplemerge extension |