diff options
| author | Edward Thomson <ethomson@edwardthomson.com> | 2015-10-28 11:00:55 -0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2015-11-25 15:37:57 -0500 |
| commit | 3f2bb387a43185991d7e077fa5e6c0bb467f2abc (patch) | |
| tree | 3e95f14ff4923d2469cf3bf6f9de34504eaefe4e /src/checkout.c | |
| parent | b1eef912cffb9e3ce9792b6aee816c1a45c85fb0 (diff) | |
| download | libgit2-3f2bb387a43185991d7e077fa5e6c0bb467f2abc.tar.gz | |
merge: octopus merge common ancestors when >2
When there are more than two common ancestors, continue merging the
virtual base with the additional common ancestors, effectively
octopus merging a new virtual base.
Diffstat (limited to 'src/checkout.c')
0 files changed, 0 insertions, 0 deletions