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

Re: [PATCH v2 4/4] mergetools/meld: Use '--output' when available

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 19, 2011, 22:58 UTC
Message-ID
<7vd3g1100w.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20110819091444.GB18054@gmail.com>
David Aguilar <davvid@gmail.com> writes:
Show 10 quoted lines
> meld 1.5.0 and newer allow the output file to be specified
> when merging multiple files.  Check whether the meld command
> supports '--output' and use it when available.
>
> Signed-off-by: David Aguilar <davvid@gmail.com>
> ---
>  mergetools/meld |   25 ++++++++++++++++++++++++-
>  1 files changed, 24 insertions(+), 1 deletions(-)
>
> Changes since v1 with help from Jonathan Nieder:
Thanks, both of you. Queued all patches in the series.
Previous: David AguilarNext: Sebastian Schuberth
Message 17 of 18 in “Refactor git-mergetool--lib.sh”
  1. 0/4 Refactor git-mergetool--lib.shDavid Aguilar, Aug 18, 2011
  2. 1/4 difftool--helper: Make style consistent with gitDavid Aguilar, Aug 18, 2011
  3. Sebastian SchuberthAug 18, 2011
  4. David AguilarAug 18, 2011
  5. Junio C HamanoAug 18, 2011
  6. 2/4 mergetool--lib: Make style consistent with gitDavid Aguilar, Aug 18, 2011
  7. 3/4 mergetool--lib: Refactor tools into separate filesDavid Aguilar, Aug 18, 2011
  8. Makefile: fix permissions of mergetools/ checked out with permissive umaskJonathan Nieder, Oct 9, 2011
  9. Jonathan NiederOct 9, 2011
  10. David AguilarOct 9, 2011
  11. Jonathan NiederOct 9, 2011
  12. Junio C HamanoOct 11, 2011
  13. 4/4 mergetools/meld: Use '--output' when availableDavid Aguilar, Aug 18, 2011
  14. Jonathan NiederAug 18, 2011
  15. David AguilarAug 18, 2011
  16. 4/4 mergetools/meld: Use '--output' when availableDavid Aguilar, Aug 19, 2011
  17. Junio C HamanoAug 19, 2011
  18. Sebastian SchuberthAug 18, 2011

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.