Mercurial > hg-stable

log

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | rev 48756: (0) -30000 -10000 -3000 -1000 -300 -100 -30 -10 -6 +6 +10 +30 +100 +300 +1000 +3000 tip
age author description
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
Thu, 03 Feb 2022 18:14:25 +0100 Pierre-Yves David narrow: add support for merging add and remove outside of the tracked set
less more | rev 48756: (0) -30000 -10000 -3000 -1000 -300 -100 -30 -10 -6 +6 +10 +30 +100 +300 +1000 +3000 tip