# (unknown) 2 messages from 2012-02-15 to 2012-02-15. Participants: Chris Leong, Jeff King. Thread: https://gitlist.dev/t/29631 ## Chris Leong, 2012-02-15 03:12 Subject: (unknown) Message-ID: URL: https://gitlist.dev/e/CAJ6vYjcefsPUfibnySpwFk2bGTC1mpBWF6Tjv5AgyyZcn0-d3A%40mail.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? ``` ## Jeff King, 2012-02-15 05:00 Subject: Re: setting merge conflict style Message-ID: <20120215050002.GA29902@sigill.intra.peff.net> URL: https://gitlist.dev/e/20120215050002.GA29902%40sigill.intra.peff.net In-Reply-To: ``` On Wed, Feb 15, 2012 at 02:12:57PM +1100, Chris Leong wrote: > Apparently setting merge.conflictstyle to diff3 will display the base > when diffing an incomplete merge, instead of just ours and theirs. Yep. > Is there a way to run this command without setting the config, so that > I can switch between normal diffs and diff3s easily? If a conflict is marked in the index (i.e., the state you are in after a conflicted merge, but before you mark a path as resolved), you can do: git checkout --conflict=diff3 Note that that is actually checking out the index contents into the working tree, so any edits you may have made to the conflicted working tree copy will be overwritten. -Peff ```