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 <path...> 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 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html