tree 299791bf0a1e4c4ea88f93021141f3d98cc8e288
parent 1621f352e3e7987792bad15dd1796dc081fb0636
author James E. Blair <jeblair@openstack.org> 1377461855 -0700
committer James E. Blair <jeblair@openstack.org> 1377619291 -0700

Use the 'resolve' merge strategy by default

We can more closely approximate Gerrit's behavior by using the
'resolve' git merge strategy.  Make that the default, and leave
the previous behavior ('git merge') as an option.  Also, finish
and correct the partially implemented plumbing for other merge
strategies (including cherry-pick).

(Note the previous unfinished implementation attempted to mimic
Gerrit's option names; the new implementation does not, but rather
documents the alignment.  It's not a perfect translation anyway,
and this gives us more room to support other strategies not
currently supported by Gerrit).

Change-Id: Ie1ce4fde5980adf99bba69a5aa1d4e81026db676