Roo-Code/apps
Roo Code a54e40f008 chore: resolve merge conflicts with main
Resolved conflicts in:
- src/core/mentions/processUserContentMentions.ts: Keep unified <user_message> tag comment while adopting mode capture refactor from main
- src/core/mentions/__tests__/processUserContentMentions.spec.ts: Keep removal of <feedback> test consistent with PR goal

All tests pass.
2026-01-10 21:43:31 +00:00
..
cli Some cleanup in ExtensionHost (#10600) 2026-01-10 02:29:33 -08:00
vscode-e2e Add a TUI (#10480) 2026-01-09 19:19:58 -08:00
vscode-nightly Revert experiments with nightly marketplace config (#6472) 2025-07-30 23:37:42 -04:00
web-evals feat(web-evals): remember last Roo model selection + add evals skill (#10470) 2026-01-07 08:00:34 -07:00
web-roo-code chore: resolve merge conflicts with main 2026-01-10 21:43:31 +00:00