What do you use for #git merges? I've recently transitioned from #vscode to #helix and still use VSCode for merging but would like to know if there's something dedicated. Wondering if there something terminal based.
Meld on macOS seems nice but isn't really a first class citizen when installed via #nix (shows Linux UI and no icon), FileMerge seems a bit too basic