ec

Simultaneously displays ours, result, and theirs in a single view, providing clear visual diff context without leaving the terminal, as demonstrated in the screenshot and feature list.

Uses familiar navigation keys like n/p for next/previous conflict and h/l for side selection, speeding up resolution for Vim users and reducing context switching.

Includes a plugin to open ec directly in a Neovim terminal buffer, blending conflict resolution into editor workflows with customizable float windows, per the README setup.

Supports non-interactive options like --apply-all ours for automating conflict resolution in CI/CD pipelines, enabling use in scripting and automated environments.

Allows color scheme personalization via a JSON config file, with support for hex colors in TrueColor terminals, though this requires specific terminal capabilities.