Files
AnyPS5/tools
AdriàandClaude Sonnet 5.5 e98780eb82 fix(main): derive the detection-disabled rename expectation from the running git
#11805 added test_main_sync_renames; main's push build 41455131775 failed its two detection-disabled cases on the runner's git 2.43, whose merge-tree ignores diff.renames/merge.renames and always detects the rename, so no conflict is reported. The tests now probe merge-tree on the fixture and expect a conflict only when the running git reports one; with detection enabled they still require a clean merge.

Co-Authored-By: Claude Sonnet 5.5 <[email protected]>
2026-11-02 16:20:25 +01:00
..