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

Re: [PATCH] mergetool: add support for ECMerge

From
Steffen Prohaska <prohaska@zib.de>
Date
Oct 9, 2007, 13:17 UTC
Message-ID
<236E44B5-361E-4CE3-8C3D-BDAD0569642E@zib.de>
In-Reply-To
<2b3a6fcd0710090603l3c3578caq3bfa6a1b8ec583f@mail.gmail.com>
On Oct 9, 2007, at 3:03 PM, Alan Hadsell wrote:
Show 6 quoted lines
> On 10/9/07, Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
>
>> What does TortoiseCVS use?
>
> They don't actually include it in the package, but they recommend
> WinMerge http://winmerge.org/, which is free (GPL).

WinMerge doesn't support 3-way merges. At least I cannot find any indication for 3-way in the manual [1] and the comparison at [2] also tells that WinMerge doesn't support 3-way.

	Steffen

[1] http://winmerge.org/2.6/manual/CompareFiles.html [2] http://en.wikipedia.org/wiki/Comparison_of_file_comparison_tools

Previous: Alan HadsellNext: Alan Hadsell
Message 8 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.