From: "Đoàn Trần Công Danh" <congdanhqx@gmail.com>
To: lin.sun@zoom.us
Cc: 'Pratyush Yadav' <me@yadavpratyush.com>,
'sunlin via GitGitGadget' <gitgitgadget@gmail.com>,
git@vger.kernel.org, 'sunlin' <sunlin7@yahoo.com>,
David Aguilar <davvid@gmail.com>
Subject: Re: [PATCH v2] Enable auto-merge for meld to follow the vim-diff beharior
Date: Sun, 28 Jun 2020 17:37:55 +0700 [thread overview]
Message-ID: <20200628103755.GB26319@danh.dev> (raw)
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
next prev parent reply other threads:[~2020-06-28 10:38 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-09 3:33 [PATCH v2] Enable auto-merge for meld to follow the vim-diff beharior lin.sun
2020-06-28 6:23 ` lin.sun
2020-06-28 10:37 ` Đoàn Trần Công Danh [this message]
2020-06-29 9:08 ` lin.sun
2020-06-30 6:48 ` David Aguilar
2020-06-30 15:55 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2020-05-08 1:25 [PATCH] " sunlin via GitGitGadget
2020-06-09 3:19 ` [PATCH v2] " sunlin via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200628103755.GB26319@danh.dev \
--to=congdanhqx@gmail.com \
--cc=davvid@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitgitgadget@gmail.com \
--cc=lin.sun@zoom.us \
--cc=me@yadavpratyush.com \
--cc=sunlin7@yahoo.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).