ec (easy-conflict) is a terminal Git mergetool with a 3-way TUI and Neovim integration.
It supports diff3 base comparison, and helps you resolve merge conflicts faster without leaving the terminal.
This is free and open source software.
Key Features
- 3 pane TUI with ours, result, and theirs.
- Diff3 base view when available via git merge-file.
- No args mode that lists conflicted files and lets you pick one.
- Non interactive modes for CI or scripts.
- Optional backup of the merged file.
Website: github.com/chojs23/ec
Support:
Developer: chojs23
License: MIT License
ec is written in Go. Learn Go with our recommended free books and free tutorials.
Related Software
| Git Tools | |
|---|---|
| git-extras | Superb collection of tools for Git |
| git-lfs | Git extension for versioning large files |
| git-filter-repo | Quickly rewrite git repository history |
| git-stats | Local git statistics including GitHub-like contributions calendars |
| git-bug | Distributed offline-first bug tracker |
| git-delta | Viewer for git and diff output |
| git-branchless | Branchless workflow for git |
| git-repair | Repair various forms of damage to git repositories |
| git-toolbelt | Suite of useful Git commands |
| git-quick-stats | Access various statistics in a git repository |
| git-secret | Bash tool which stores private data inside a git repo |
| git-annex | Manage files with git without checking the file contents into git |
| git-absorb | Super-charging git rebase |
| git-standup | Recall what you did on the last working day |
| git-town | Automate the creation, synchronization, shipping, and cleanup |
| git-of-theseus | Analyze how a Git repo grows over time |
| git-crypt | Transparent file encryption in git |
| gita | Manage multiple git repos |
| git-machete | Robust tool that simplifies your git workflows |
| git-imerge | Incremental merge and rebase for Git |
| git-chglog | CHANGELOG generator implemented in Go |
| git-fuzzy | Interactive git with the help of fzf |
| git-big-picture | Visualization tool that removes uninteresting commits |
| hercules | Gain advanced insights from Git repository history |
| git-sizer | Compute various size metrics for a git repository |
| git-crecord | Interactively select changes to commit or stage |
| git-xargs | Update across multiple GitHub repositories |
| git-fame | Git repository collaborators sorted by contributions |
| git-prompt.zsh | Lightweight git prompt for zsh |
| git-flow | High-level repository operations |
| mamediff | Manages unstaged and staged Git diffs |
| Git Interactive Rebase Tool | Terminal-based sequence editor for interactive rebase |
| Forge Sparks | Get Git forges notifications |
Read our verdict in the software roundup.
 Explore our comprehensive directory of recommended free and open source software. Our carefully curated collection spans every major software category.This directory is part of our ongoing series of informative articles for Linux enthusiasts. It features hundreds of detailed reviews, along with open source alternatives to proprietary solutions from major corporations such as Google, Microsoft, Apple, Adobe, IBM, Cisco, Oracle, and Autodesk. You’ll also find interesting projects to try, hardware coverage, free programming books and tutorials, and much more. Know a useful open source Linux program that we haven’t covered yet? Let us know by completing this form. |