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

Git merge using patience diff?

From
Cchombee <chombee@lavabit.com>
Date
Apr 26, 2010, 18:09 UTC
Message-ID
<20100426180923.GC18122@debxo>
Hey,
Is it possible to get git to use patience diff when merging?

My version of git is 1.5.*, from before git diff had the --patience option. I got git diff to use bzr's implementation of patience diff via GIT_EXTERNAL_DIFF. But when merging git still seems to use its normal diff. Will I need to write my own merge driver that uses patience diff?

Thanks
Next: Jonathan Nieder
Message 1 of 2 in “Git merge using patience diff?”
  1. chombeeApr 26, 2010
  2. Jonathan NiederApr 26, 2010

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.