fix: assure that blob merges recognize conflicts in cojunction with empty bases.#2207

Byron merged 1 commit intomainGitoxideLabs/gitoxide:mainfrom

improvementsGitoxideLabs/gitoxide:improvementsCopy head branch name to clipboard