ntbang0901 f752f2db08 feat(vcs): make the merge editor work like IntelliJ's merge tool (#902) ...

The result pane starts from the base and every change, conflicting or not, gets Accept / Ignore next to its side; accepting one side of a conflict still lets the other side be appended, and the modifier key resolves using that side directly. Adds Resolve Simple Conflicts (word-level), Apply Non-Conflicting Changes from the left, right or both (optionally on opening), Revert Conflict Resolution, Accept Yours / Accept Theirs / Cancel / Apply, Compare Contents between any two versions, and undo back to the conflicted state. CRLF and UTF-16 files are written back exactly, deleted sides and binary files are handled, and the commands are registered as merge.* actions.

Refs #826

Co-authored-by: ntbang0901 <[email protected]>

2026-11-03 23:37:38 +08:00

..

agentsDock.spec.ts

feat(agents): dock a session in the Agents tool window (#588)

2026-11-01 11:31:53 +08:00

compareWith.spec.ts

feat(vcs): offer Compare With… in the editor and tab menus, and outside the desktop app (#433)

2026-10-30 19:25:41 +08:00

console-selection.spec.ts

fix(run): select and copy the whole console output with Select All (#903)

2026-11-02 23:41:21 +08:00

diff.spec.ts

feat(vcs): recognize moved and edited code in the diff viewer (#868)

2026-11-03 23:26:36 +08:00

diffRepo.ts

feat(vcs): recognize moved and edited code in the diff viewer (#868)

2026-11-03 23:26:36 +08:00

editor.spec.ts

perf(editor): stop re-rendering breadcrumbs on every caret move (#256)

2026-10-29 23:41:03 +08:00

fixtures.ts

feat(vcs): make the merge editor work like IntelliJ's merge tool (#902)

2026-11-03 23:37:38 +08:00

gitIgnore.spec.ts

feat(vcs): add Add to .gitignore to the commit changes menu (#371)

2026-10-30 15:09:55 +08:00

mergeEditor.spec.ts

feat(vcs): make the merge editor work like IntelliJ's merge tool (#902)

2026-11-03 23:37:38 +08:00

overviewLane.spec.ts

fix(editor): show the scrollbar thumb over overview marks (#1031)

2026-11-03 20:31:57 +08:00

projectTree.spec.ts

feat(vcs): add shared and local Git ignore actions (#255)

2026-10-29 19:43:44 +08:00

search.spec.ts

test(e2e): Drive the Language Servers page through its list and details

2026-10-24 12:11:21 +08:00

services.spec.ts

feat(services): reorder services within a run configuration type (#345)

2026-10-31 01:28:41 +08:00

settings.spec.ts

feat(settings): add editable font search and refresh (#251)

2026-10-29 23:35:33 +08:00

terminal-clipboard.spec.ts

feat(terminal): paste clipboard media as file paths (#880)

2026-11-03 02:09:17 +08:00

themes.spec.ts

feat(themes): Built-in Solarized and One light/dark themes (#85)

2026-10-27 18:53:12 +08:00

toolwindows.spec.ts

feat(terminal): split the tool window into tab groups, as IDEA (#864)

2026-11-03 23:20:11 +08:00

treeWidth.fixture.tsx

fix(tree): preserve horizontal scroll when expanding unrelated nodes (#504)

2026-10-31 05:20:39 +08:00

treeWidth.html

fix(tree): preserve horizontal scroll when expanding unrelated nodes (#504)

2026-10-31 05:20:39 +08:00

treeWidth.spec.ts

fix(tree): preserve horizontal scroll when expanding unrelated nodes (#504)

2026-10-31 05:20:39 +08:00

tsconfig.json

Initial open-source release

2026-10-22 18:55:10 +08:00

usage-highlight-contrast.spec.ts

fix(code-insight): keep usage highlights readable (#855)

2026-11-02 20:09:27 +08:00

workbench.spec.ts

test(e2e): Run specs with the macOS keymap on every host; update stale specs

2026-10-22 22:09:08 +08:00