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

Re: Choosing a mergetool according to file type

From
Johannes Sixt <j.sixt@viscovery.net>
Date
Jun 26, 2009, 11:29 UTC
Message-ID
<4A44B128.6040800@viscovery.net>
In-Reply-To
<C66A69E6.205F2%jefferis@gmail.com>
Gregory Jefferis schrieb:
Show 7 quoted lines
> http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk/contrib/diff-scripts/
> 
> diff-doc.js
> merge-doc.js
> 
> Perhaps tortoisegit already exposes this.  Those scripts include fallbacks
> for openoffice so I suppose one could use that on linux.
Thanks a lot for the pointer.

The interesting one is merge-doc.js. Unfortunately, it still only just compares "their" and "our" versions, and the user must go through all marked changes and reject everything that would undo "our" changes and accept all "their" changes. That's exactly what I already do. :-(

That said, the scripts are written *much* nicer than what I have written myself.

-- Hannes
Previous: Gregory JefferisNext: Matthieu Moy
Message 2 of 8 in “Re: Choosing a mergetool according to file type”
  1. Gregory JefferisJun 26, 2009
  2. Johannes SixtJun 26, 2009
  3. Matthieu MoyJun 26, 2009
  4. Gregory JefferisJun 26, 2009
  5. Matthieu MoyJun 26, 2009
  6. Junio C HamanoJun 26, 2009
  7. Gregory JefferisJun 26, 2009
  8. Gregory JefferisJun 26, 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.