Lutra/ui/tests/vcs
danny 750ecf5e51 F1: conflict toast closes when the merge ends, toasts keep off the commit box
The merge store dismisses its conflict warning once the status lists no
conflicted file (resolved, committed or aborted) and replaces it on a new
conflicted merge. The toast stack moves above areas registered with
keepClearOf; the Changes window registers its commit box.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-02 18:53:08 +01:00
..
Branches.test.ts M4.5: branch status-bar item and branches popup 2026-10-26 17:56:24 +01:00
ChangesToolWindow.test.ts F1: conflict toast closes when the merge ends, toasts keep off the commit box 2026-11-02 18:53:08 +01:00
DiffView.test.ts M4.6: Git log and file history 2026-10-28 18:00:24 +01:00
Log.test.ts A3: name the adoption wait adopted(), not a second settled() 2026-10-31 20:56:50 +01:00
Merge.test.ts F1: conflict toast closes when the merge ends, toasts keep off the commit box 2026-11-02 18:53:08 +01:00
Remote.test.ts M4.10: remotes: fetch, pull, push, clone and manage remotes 2026-10-29 17:50:26 +01:00
Stash.test.ts M4.9: Git stash (stash, list, apply, pop, drop) with clear refusals 2026-10-30 17:37:53 +01:00
vcsStatus.test.ts M4.4: Git gutter change markers and status colours in tree and tabs 2026-10-25 17:40:30 +01:00