sourcegit icon indicating copy to clipboard operation
sourcegit copied to clipboard

[wip] Integrated merge tool

Open wl2776 opened this issue 10 months ago • 2 comments

Attempt to resolve #892

Currently it displays conflicted content. However, scroll bars, line numbers and styles are absent, and I cannot figure out how to make them appear.

I was looking at TextDiffView for code samples.

@love-linger, could you look and advice a direction on how to make them to appear?

wl2776 avatar Feb 16 '25 15:02 wl2776

Any plans to finish this?

palmerj avatar Jun 19 '25 05:06 palmerj

Any plans to finish this?

Sorry, currently no plans

wl2776 avatar Jun 20 '25 01:06 wl2776