Mercurial > hg
graph
-
simplemerge: let extension check for binary inputs (unless `--text`)Thu, 10 Feb 2022 13:36:09 -0800, by Martin von Zweigbergk
-
simplemerge: store input data in MergeInputThu, 10 Feb 2022 11:00:32 -0800, by Martin von Zweigbergk
-
simplemerge: convert MergeInput to regular, non-attr.ib classFri, 04 Feb 2022 18:36:36 -0800, by Martin von Zweigbergk
-
simplemerge: replace `**opts` passed to `simplemerge()` by keyword argumentsThu, 10 Feb 2022 09:59:07 -0800, by Martin von Zweigbergk
-
narrow: add support for merging add and remove outside of the tracked setThu, 03 Feb 2022 18:14:25 +0100, by Pierre-Yves David