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

[PATCH 0/2 v3] mergetool

From
Steffen Prohaska <prohaska@zib.de>
Date
Oct 17, 2007, 17:16 UTC
Message-ID
<11926413722362-git-send-email-prohaska@zib.de>
So here they are again.
    Steffen
Next: Steffen Prohaska
Message 1 of 10 in “mergetool”
  1. 0/2 mergetoolSteffen Prohaska, Oct 17, 2007
  2. 1/2 mergetool: use path to mergetool in config var mergetool.<tool>.pathSteffen Prohaska, Oct 17, 2007
  3. 2/2 mergetool: add support for ECMergeSteffen Prohaska, Oct 17, 2007
  4. Shawn O. PearceOct 18, 2007
  5. Steffen ProhaskaOct 18, 2007
  6. 1/2 mergetool: use path to mergetool in config var mergetool.<tool>.pathSteffen Prohaska, Oct 18, 2007
  7. Shawn O. PearceOct 18, 2007
  8. Steffen ProhaskaOct 18, 2007
  9. mergetool: avoid misleading message "Resetting to default..."Steffen Prohaska, Oct 18, 2007
  10. Steffen ProhaskaOct 17, 2007

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.