| commit | 264905dfa78362e694a3ddaa08828cf2bdd0dc56 | [log] [tgz] |
|---|---|---|
| author | Stephen Li <stephenli@google.com> | Fri Jun 16 18:45:24 2017 -0700 |
| committer | Stephen Li <stephenli@google.com> | Mon Jun 19 22:01:30 2017 +0000 |
| tree | 2815f37ea295cacdb9dd091b7c65b38b75f76421 | |
| parent | 47644068e19805e0131c53993726fdcb2ad8e142 [diff] |
Handle diamond merges correctly. If we have branches top, left, right, and bottom, and left == right, then creating a change on top should create two changes with the same sha on left and right, and only a single change on bottom. top -> left -> bottom, and top -> right -> bottom simultaneously. Change-Id: I8813cefb7cb7052b435dbef4e1af422c516e13a0