{"thread":{"id":"29631","subject":"(unknown)","startedAt":"2012-02-15T03:12:57Z","lastAt":"2012-02-15T05:00:03Z","messageCount":2,"participants":["Chris Leong","Jeff King"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"184742","messageId":"CAJ6vYjcefsPUfibnySpwFk2bGTC1mpBWF6Tjv5AgyyZcn0-d3A@mail.gmail.com","threadId":"29631","inReplyTo":null,"subject":"(unknown)","fromName":"Chris Leong","fromEmail":"walkraft@gmail.com","sentAt":"2012-02-15T03:12:57Z","receivedAt":"2012-02-15T03:12:57Z","isPatch":false,"sender":{"key":"walkraft@gmail.com","avatar":"https://gravatar.com/avatar/b652eca2f2121a90d994b41963e2b6bd9546a39e26dba0f06c8ccb478fceef3d?d=mp&s=160"},"body":"Apparently setting merge.conflictstyle to diff3 will display the base\nwhen diffing an incomplete merge, instead of just ours and theirs.\n\nIs there a way to run this command without setting the config, so that\nI can switch between normal diffs and diff3s easily?\n"},{"id":"184745","messageId":"20120215050002.GA29902@sigill.intra.peff.net","threadId":"29631","inReplyTo":"CAJ6vYjcefsPUfibnySpwFk2bGTC1mpBWF6Tjv5AgyyZcn0-d3A@mail.gmail.com","subject":"Re: setting merge conflict style","fromName":"Jeff King","fromEmail":"peff@peff.net","sentAt":"2012-02-15T05:00:03Z","receivedAt":"2012-02-15T05:00:03Z","isPatch":false,"sender":{"key":"peff@peff.net","avatar":"https://avatars.githubusercontent.com/u/45925?v=4"},"body":"On Wed, Feb 15, 2012 at 02:12:57PM +1100, Chris Leong wrote:\n\n> Apparently setting merge.conflictstyle to diff3 will display the base\n> when diffing an incomplete merge, instead of just ours and theirs.\n\nYep.\n\n> Is there a way to run this command without setting the config, so that\n> I can switch between normal diffs and diff3s easily?\n\nIf a conflict is marked in the index (i.e., the state you are in after a\nconflicted merge, but before you mark a path as resolved), you can do:\n\n  git checkout --conflict=diff3 <path...>\n\nNote that that is actually checking out the index contents into the\nworking tree, so any edits you may have made to the conflicted working\ntree copy will be overwritten.\n\n-Peff\n"}]}