Mercurial > hg
log
age | author | description |
---|---|---|
Fri, 14 Jan 2022 08:17:13 -0800 | Martin von Zweigbergk | simplemerge: move printing of merge result to extension |
Thu, 10 Feb 2022 15:48:01 -0800 | Martin von Zweigbergk | simplemerge: remove code for checking binary input now that callers do it |
Thu, 10 Feb 2022 15:27:58 -0800 | Martin von Zweigbergk | simplemerge: let filemerge check for binary inputs |
Thu, 10 Feb 2022 13:36:09 -0800 | Martin von Zweigbergk | simplemerge: let extension check for binary inputs (unless `--text`) |
Thu, 10 Feb 2022 11:00:32 -0800 | Martin von Zweigbergk | simplemerge: store input data in MergeInput |
Fri, 04 Feb 2022 18:36:36 -0800 | Martin von Zweigbergk | simplemerge: convert MergeInput to regular, non-attr.ib class |
Thu, 10 Feb 2022 09:59:07 -0800 | Martin von Zweigbergk | simplemerge: replace `**opts` passed to `simplemerge()` by keyword arguments |