* (unknown),
@ 2012-02-15 3:12 Chris Leong
2012-02-15 5:00 ` setting merge conflict style Jeff King
0 siblings, 1 reply; 2+ messages in thread
From: Chris Leong @ 2012-02-15 3:12 UTC (permalink / raw)
To: git
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?
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: setting merge conflict style
2012-02-15 3:12 (unknown), Chris Leong
@ 2012-02-15 5:00 ` Jeff King
0 siblings, 0 replies; 2+ messages in thread
From: Jeff King @ 2012-02-15 5:00 UTC (permalink / raw)
To: Chris Leong; +Cc: git
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-02-15 5:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-02-15 3:12 (unknown), Chris Leong
2012-02-15 5:00 ` setting merge conflict style Jeff King
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).