https://bz.apache.org/ooo/show_bug.cgi?id=128554

--- Comment #4 from [email protected] ---
(In reply to Matthias Seidel from comment #3)
> I have conflicts when cherry-picking to AOO42X from
> 
> 195282cf3d8bfaa9e1cec43b093251d9df87f4ba (trunk)
> 
> but not when I cherry-pick from
> 
> 195282cf3d8bfaa9e1cec43b093251d9df87f4ba (AOO41X)
> 
> Is there a difference?

Yes, the document test file
test/testuno/source/fvt/uno/sc/formula/TestFormulaDocs.java was changed by
7d8592c79cfa104063570593e943fed55296950b in 2022, so fixes that added test
documents after that won't apply to earlier branches.

I've now cherry-picked both for AOO42X.

-- 
You are receiving this mail because:
You are the assignee for the issue.

Reply via email to