fix(apply_diff): exclude exact REPLACE marker from merge conflict check#4922

Open

YuriNachos wants to merge 3 commits intoKilo-Org:mainfrom

YuriNachos:fix/apply-diff-replace-marker-4680

Commits on Jan 10, 2026

fix(skills): use actual home directory path instead of tilde on Windows

Yurii Chukhlib
and
claude
committed
fix(vscode-lm): check if API is available before using it

Yurii Chukhlib
and
claude
committed
fix(apply_diff): exclude exact REPLACE marker from merge conflict check

Yurii Chukhlib
and
claude
committed