| commit | df63f1aae5ff966a46a0b3382d5f1606411fd0f7 | [log] [tgz] |
|---|---|---|
| author | Shawn Pearce <sop@google.com> | Tue Aug 26 15:16:51 2014 -0700 |
| committer | Shawn Pearce <sop@google.com> | Wed Aug 27 16:05:56 2014 -0700 |
| tree | 13678b96c7b006a53c8c8c31e795aa76417183f9 | |
| parent | 0f91bac0495857bd1d145f5c799e794bc7b75920 [diff] |
Allow PatchListLoader to use recursive merger The automerge "base" created on merge commits should use the recursive merger, if it has not been disabled on this server. Switching to recursive allows handling changes that require the virtual common ancestor to be built when multiple merge bases are discovered for the two parents. Change-Id: Ica2daa6bd0a38f7fa1430bed28bd7f54d3bfb2c4