tree 04af857877cb28945e34d935caf10f96e70ace8e
parent 17d2d8fc06802e2d12020f62fb05460e000881b5
author Edwin Kempin <ekempin@google.com> 1729244484 +0000
committer Paladox none <thomasmulhall410@yahoo.com> 1729514225 +0000

Support rebasing change edits with diff3 format

Release-Notes: skip
Bug: Google b/364179875
Change-Id: Ib3dbce6dd2469adacabba4d4895266957706e804
Signed-off-by: Edwin Kempin <ekempin@google.com>
(cherry picked from commit 9b672c0f0d600f4d99b5e73db3e15dbbb07b6189)