Merges ours and theirs against their common base.
ours
theirs
base
A side that did not touch a file loses to the side that did, which is the ordinary three-way rule. Both touching one differently is a merge for text and a conflict for anything else.
Merges
oursandtheirsagainst their commonbase.A side that did not touch a file loses to the side that did, which is the ordinary three-way rule. Both touching one differently is a merge for text and a conflict for anything else.