git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2] Enable auto-merge for meld to follow the vim-diff beharior

From
Đoàn Trần Công Danh <congdanhqx@gmail.com>
Date
Jun 28, 2020, 10:37 UTC
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
Previous: lin.sun@zoom.usNext: lin.sun@zoom.us
Message 3 of 6 in “RE: [PATCH v2] Enable auto-merge for meld to follow the vim-diff beharior”
  1. lin.sun@zoom.usJun 9, 2020
  2. lin.sun@zoom.usJun 28, 2020
  3. Đoàn Trần Công DanhJun 28, 2020
  4. lin.sun@zoom.usJun 29, 2020
  5. David AguilarJun 30, 2020
  6. Junio C HamanoJun 30, 2020

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.