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

Re: [PATCH] mergetool: add support for ECMerge

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Oct 9, 2007, 12:37 UTC
Message-ID
<Pine.LNX.4.64.0710091335580.4174@racer.site>
In-Reply-To
<1C50C046-3D61-4D55-8D38-B2D563C1FF2A@zib.de>
Hi,
On Tue, 9 Oct 2007, Steffen Prohaska wrote:
> I work on the msysgit project and I'd like to have mergetool available 
> before I advertise git on Windows. It makes merging so much easier ;)

I would _hate_ to rely on a closed source program (in addition to Windows itself) in msysGit.

And it seems that you cannot even get ECMerge for free in general.
What does TortoiseCVS use?

Ciao, Dscho

Previous: Steffen ProhaskaNext: Steffen Prohaska
Message 5 of 15 in “mergetool: support absolute paths to tools by git config merge.<tool>path”
  1. mergetool: support absolute paths to tools by git config merge.<tool>pathSteffen Prohaska, Oct 8, 2007
  2. mergetool: add support for ECMergeSteffen Prohaska, Oct 8, 2007
  3. Theodore TsoOct 8, 2007
  4. Steffen ProhaskaOct 9, 2007
  5. Johannes SchindelinOct 9, 2007
  6. Steffen ProhaskaOct 9, 2007
  7. Alan HadsellOct 9, 2007
  8. Steffen ProhaskaOct 9, 2007
  9. Alan HadsellOct 9, 2007
  10. Theodore TsoOct 8, 2007
  11. Theodore TsoOct 8, 2007
  12. Steffen ProhaskaOct 9, 2007
  13. Frank LichtenheldOct 8, 2007
  14. Steffen ProhaskaOct 9, 2007
  15. Johannes SchindelinOct 9, 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.