Mercurial > hg
log tests/test-merge-partial-tool.t @ 51832:4eccb65e444f default tip
age | author | description |
---|---|---|
Tue, 03 Jan 2023 13:38:56 -0800 | Martin von Zweigbergk | filemerge: fix crash when using filesets in [partial-merge-tools] stable 6.3.2 |
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 |