merge-ort: handle cached rename & trivial resolution interaction better#2095

newren wants to merge 1 commit intogitgitgadget:mastergitgitgadget/git:masterfrom

newren:better-cache-rename-trivial-resolution-fixnewren/git:better-cache-rename-trivial-resolution-fixCopy head branch name to clipboard