ec: easy-conflict
I stumbled across this a few months ago when searching for an alternative to Meld with a TUI interface for doing three-way merges for when coding within a VM. It’s been working well for me so far.
I stumbled across this a few months ago when searching for an alternative to Meld with a TUI interface for doing three-way merges for when coding within a VM. It’s been working well for me so far.