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

Re: [PATCH 2/3] mergetool-lib: specialize xxdiff options when in diff mode

From
Markus Heidelberg <markus.heidelberg@web.de>
Date
Apr 2, 2009, 21:20 UTC
Message-ID
<200904022320.55334.markus.heidelberg@web.de>
In-Reply-To
<1238668246-762-2-git-send-email-davvid@gmail.com>
David Aguilar, 02.04.2009:
> We don't need '-merged-file', 'save as', and the merge-status exit
> code when in diff mode

I guess the same as for xxdiff and kdiff3 also applies to opendiff, ecmerge and emerge. But since I don't have them installed, I'm not entirely sure not to break something. On the other hand it should be save, since they were just copied from git-mergetool without adjustment for diff use.

Markus
Previous: Junio C HamanoNext: David Aguilar
Message 6 of 7 in “mergetool-lib: specialize kdiff3 options when in diff mode”
  1. 1/3 mergetool-lib: specialize kdiff3 options when in diff modeDavid Aguilar, Apr 2, 2009
  2. 2/3 mergetool-lib: specialize xxdiff options when in diff modeDavid Aguilar, Apr 2, 2009
  3. 3/3 mergetool-lib: add diffuse as merge and diff toolDavid Aguilar, Apr 2, 2009
  4. David AguilarApr 2, 2009
  5. Junio C HamanoApr 2, 2009
  6. Markus HeidelbergApr 2, 2009
  7. David AguilarApr 3, 2009

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.