ours
This resolves any number of heads, but the result of the
merge is always the current branch head. It is meant to be
used to supersede old development history of side branches.
I don't think this is what you want.
In recent enough git, you have "git merge --no-ff" (don't think it's
in a released version though).
--
Matthieu