tree e02d125ee4aefe79730177ef0b312a7c847ae938
parent c43c7f4f7ef58d3051db5bf25b095485cdf430d0
author Edwin Kempin <ekempin@google.com> 1729238332 +0000
committer Paladox none <thomasmulhall410@yahoo.com> 1729514212 +0000

Allow rebasing change edits with conflicts

Bug: Google b/364179875
Release-Notes: Added support for rebasing change edits with conflicts
Change-Id: I8ad5627b5dac19b4608efb377b772478c03f1b43
Signed-off-by: Edwin Kempin <ekempin@google.com>
(cherry picked from commit 34699b66ad4165132c375386225c0279895eb983)