tree 2b5d4cf165cc6bc13f74d4f5cc0cd65bde47d58b
parent 1f8bf7904e776f367e0d3bf4b0f6696fef86252d
author Edwin Kempin <ekempin@google.com> 1729237085 +0000
committer Paladox none <thomasmulhall410@yahoo.com> 1729514189 +0000

Include conflicting files into message when rebasing change edit fails

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