{"repo":"chojs23/ec","free":true,"listed":false,"github":"https://github.com/chojs23/ec","clone":"git clone https://github.com/chojs23/ec.git","description":"Easy terminal-native 3-way git mergetool vim-like workflow","language":"Go","stars":290,"topics":["cli","conflict-resolution","git","go","tui","conflict","mergetool","neovim","terminal","golang"],"license":"MIT","category":"cli-tools","readme_excerpt":"ec (easy-conflict) Terminal Git mergetool with a 3-way TUI and Neovim integration With Lazygit ec (easy-conflict) is a 3-way terminal native Git merge conflict resolver. Supports diff3 base comparison, and helps you resolve merge conflicts faster without leaving the terminal. Features 1. 3 pane TUI with ours, result, and theirs 2. Diff3 base view when available via git merge-file 3. No args mode that lists conflicted files and lets you pick one 4. Non interactive modes for CI or scripts 5. Optional backup of the merged file Installation Homebrew Npm Or run without installing: The npm package is a thin installer that downloads the matching prebuilt binary from GitHub Releases at install time. Set EC SKIP DOWNLOAD=1 to skip the postinstall download in restricted environments. Nix Install the packaged release from nixpkgs: Run the latest repo state without installing: Install the latest repo state into your profile: The nixpkgs package can lag behind the latest upstream release. Use the direct repo commands above if you want the newest branch or tag immediately. Install script You can run the installer through Make: - On Windows, this runs scripts/install.ps1 . - On Linux/macOS, this runs scripts/install.sh . Go install Via curl Arch Linux (AUR) build from source: binary: Windows Download a Windows binary from GitHub Releases and add it to your PATH . PowerShell installer (default: latest release, install to $HOME\\\\.local\\\\bin ): Available release artifacts: - ec-windows-amd64.e","default_branch":null,"files":null,"tree":[],"storefront":"/r/chojs23","claimed":false,"request_supported":{"post":"https://gitbuyer.com/r/chojs23/ec/request-supported","requests":0},"note":"indexed from public GitHub; nothing is for sale on this page. Clone it from GitHub. Paid listings live at /search."}