From: Đoàn Trần Công Danh Date: Sun, 28 Jun 2020 10:37:55 GMT Subject: Re: [PATCH v2] Enable auto-merge for meld to follow the vim-diff beharior Message-ID: <20200628103755.GB26319@danh.dev> In-Reply-To: <0c2401d64d14$aeafa680$0c0ef380$@zoom.us> On 2020-06-28 14:23:43+0800, lin.sun@zoom.us wrote: > Hi Pratyush, > > Could you help to review and merge this patch? > Or do you know who can review and merge this patch please? It seems like only David Aguilar (Cc-ed) works on that file. Look into b12d04503b (mergetools/meld: make usage of `--output` configurable and more robust, 2014-10-15), it looks like we need to check if --auto-merge option is available in meld. Someone still live with the ancient tools ;). meld has known --output for a long time but we still have a check for it. -- Danh