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

Re: using xdl_merge(), was Re: Resolving conflicts

From
Johannes Schindelin <johannes.schindelin@gmx.de>
Date
Dec 5, 2006, 18:36 UTC
Message-ID
<Pine.LNX.4.63.0612051926360.28348@wbgn013.biozentrum.uni-wuerzburg.de>
In-Reply-To
<4575B32F.5060108@ramsay1.demon.co.uk>
Hi,
On Tue, 5 Dec 2006, Ramsay Jones wrote:
> Have you had time to look at my test cases?

Not really. Besides, I did _not_ implement a full diff3, but _just_ the merge. I.e. my function does not output anything, but (in theory) fills a buffer with what merge would have written into the first file.

However, once I understand how your tests work, I'll try to concoct a test script for git-with-xdl_merge.

Ciao,
Previous: Johannes SchindelinNext: Linus Torvalds
Message 31 of 32 in “Resolving conflicts”
  1. Wink SavilleDec 1, 2006
  2. Alan ChandlerDec 1, 2006
  3. Wink SavilleDec 1, 2006
  4. Alan ChandlerDec 1, 2006
  5. Linus TorvaldsDec 1, 2006
  6. Wink SavilleDec 1, 2006
  7. Linus TorvaldsDec 1, 2006
  8. Linus TorvaldsDec 1, 2006
  9. Alan ChandlerDec 1, 2006
  10. Wink SavilleDec 1, 2006
  11. Alan ChandlerDec 1, 2006
  12. Wink SavilleDec 2, 2006
  13. Linus TorvaldsDec 2, 2006
  14. Junio C HamanoDec 2, 2006
  15. using xdl_merge(), was Re: Resolving conflictsJohannes Schindelin, Dec 2, 2006
  16. Ramsay JonesDec 5, 2006
  17. Linus TorvaldsDec 5, 2006
  18. Junio C HamanoDec 5, 2006
  19. Johannes SchindelinDec 5, 2006
  20. Junio C HamanoDec 5, 2006
  21. xdl_merge(): fix and simplify conflict handlingJohannes Schindelin, Dec 5, 2006
  22. Junio C HamanoDec 5, 2006
  23. Johannes SchindelinDec 5, 2006
  24. Junio C HamanoDec 5, 2006
  25. Jakub NarebskiDec 5, 2006
  26. Johannes SchindelinDec 5, 2006
  27. Junio C HamanoDec 6, 2006
  28. Johannes SchindelinDec 6, 2006
  29. Junio C HamanoDec 6, 2006
  30. Johannes SchindelinDec 6, 2006
  31. Johannes SchindelinDec 5, 2006
  32. Linus TorvaldsDec 1, 2006

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.