Use 3-way merge editor to view and edit SVN merge conflicts · JohnstonCode/svn-scm@0d305c8

src/commands/openConflict.ts#L19

Replace `!info.conflict·||·!info.conflict.curBaseFile·||·!info.conflict.prevWcFile·||·!info.conflict.prevBaseFile` with `⏎········!info.conflict·||⏎········!info.conflict.curBaseFile·||⏎········!info.conflict.prevWcFile·||⏎········!info.conflict.prevBaseFile⏎······`

src/commands/openConflict.ts#L30

Replace `·base,·input1,·input2,·output:·result` with `⏎········base,⏎········input1,⏎········input2,⏎········output:·result⏎·····`

src/common/types.ts#L50

Insert `⏎······`

src/common/types.ts#L51

Insert `··`

src/common/types.ts#L52

Insert `··`

src/common/types.ts#L53

Replace `······` with `········`

src/common/types.ts#L54

Insert `··`