The terminal's conflict screen has a test: take ours, theirs, both or your own text per block, and `f` commits what was chosen #8354

The conflict resolver a person trusts with a merge is proven to do what its keys say. src/tui/screens/conflicts.ts (220 lines, reached from the pull screen at src/tui/screens/pull.ts:885) has no test that drives it. test/tui-screens.test.ts only asserts that a conflicting pull cannot open the merge dialog.

Done:

• [ ] A new test/tui-conflicts.test.ts uses the tui harness the other tui-*.test.ts files use, on a pull with two conflicted blocks in one file.
• [ ] It drives o on the first block and t on the second, sees "2 of 2 resolved", presses f, and asserts the committed file is ours-then-theirs.
• [ ] A second case covers b (both) and e (own text), and that leaving without f commits nothing.

Files: test/tui-conflicts.test.ts only. Risk: if the test finds a bug, fix it in src/tui/screens/conflicts.ts in the same pull and say so.