James E. Blair 19deff2a49 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		2013-08-27 09:01:31 -07:00
..
source	Use the 'resolve' merge strategy by default	2013-08-27 09:01:31 -07:00
Makefile	sphinx is now stricter	2013-01-15 18:35:53 +00:00