Mercurial > hg

log tests/test-merge-partial-tool.t @ 49722:f4626b74b941

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Tue, 26 Apr 2022 09:06:30 -0700 Martin von Zweigbergk filemerge: add configs to disable some or all partial merge tools
Thu, 17 Mar 2022 11:19:06 -0700 Martin von Zweigbergk partial-merge: add support for `.args` config (`$local` etc.)
Tue, 18 Jan 2022 13:05:21 -0800 Martin von Zweigbergk filemerge: add support for partial conflict resolution by external tool
less more | (0) tip