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

(unknown)

From
Chris Leong <walkraft@gmail.com>
Date
Feb 15, 2012, 03:12 UTC
Message-ID
<CAJ6vYjcefsPUfibnySpwFk2bGTC1mpBWF6Tjv5AgyyZcn0-d3A@mail.gmail.com>

Apparently setting merge.conflictstyle to diff3 will display the base when diffing an incomplete merge, instead of just ours and theirs.

Is there a way to run this command without setting the config, so that I can switch between normal diffs and diff3s easily?

Next: Jeff King
Message 1 of 2 in “(unknown)”
  1. Chris LeongFeb 15, 2012
  2. Jeff KingFeb 15, 2012

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.