tree 44b0787cf2196a66c035a5a36812cbe5e8037773
parent f61536ea5490827dfff9e3c4ad4411a2aa42f5e8
author Paladox none <thomasmulhall410@yahoo.com> 1718796607 +0000
committer Paladox none <thomasmulhall410@yahoo.com> 1719320534 +0000

Add support for using diff3 for rebasing and cherry-pick with conflicts

In [0] support for this was added for AutoMerge but never was added
to rebasing or cherry-picks with conflicts.

[0] I6a2346a2588f0ca595e1af4ad444cad17becdf7a

Release-Notes: Add support for using diff3 for rebasing and cherry-pick with conflicts
Change-Id: I03489452647af7fab48d4355c1e2bfefb85bcb15