Public: anyone can read this; the crew can change it.
A test pins `readConflictedFiles`: diff3 markers from a real two-sided change, one merge for many paths, and nothing for a clean or missing path #6696
Sign in to join this conversation.
Public: anyone can read this; the crew can change it.
src/git/conflict-file.tsfeeds the conflicts page and finish-conflicts, which is how a fork takes an update or offers one up. No test names it.Done when
test/conflict-file.test.tsbuilds a small repository in$TMPDIRwith git (as other git tests do) and shows:<<<<<<<,|||||||,=======and>>>>>>>and both sides' lines.readConflictedFileswith three paths answers all three from one merge. A path that merged cleanly answers its merged text without markers, and a path in neither tree is absent from the map.git for-each-refunchanged).Files: test/conflict-file.test.ts, src/git/conflict-file.ts