ec

{
  "aliases": [],
  "alternatives": [],
  "build_dependencies": [
    "go"
  ],
  "categories": [],
  "caveats": null,
  "conflicts_with": [],
  "dependencies": [],
  "deprecated": 0,
  "deprecation_reason": null,
  "desc": "TUI 3-way git mergetool",
  "disable_reason": null,
  "disabled": 0,
  "enrichment_fetched_at": "2026-06-20T23:37:14+00:00",
  "first_seen": "2026-06-20T23:34:18+00:00",
  "full_name": "ec",
  "github_default_branch": "main",
  "github_last_commit_at": "2026-06-11T14:01:30Z",
  "github_readme_excerpt": "# ec (easy-conflict)\n\nTerminal Git mergetool with a 3-way TUI and Neovim integration\n\n[![codecov](https://codecov.io/gh/chojs23/ec/graph/badge.svg?token=AX5BFUF8YN)](https://codecov.io/gh/chojs23/ec)\n\n\u003cimg alt=\"ec 3-way terminal git mergetool\" src=\"https://github.com/user-attachments/assets/f6903327-15c6-4fc0-9427-5bd820ba02ec\" /\u003e\n\n![ec demo resolving git merge conflicts in terminal](https://github.com/user-attachments/assets/7c3eba19-d72b-499b-b2e8-3e16f645407e)\n\n\u003e With Lazygit\n\n![ec with lazygit](https://github.com/user-attachments/assets/debd1426-5259-47d2-aa83-def364746f3f)\n\nec (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.\n\n## Features\n\n1. 3 pane TUI with ours, result, and theirs\n2. Diff3 base view when available via git merge-file\n3. No args mode that lists conflicted files and lets you pick one\n4. Non interactive modes for CI or scripts\n5. Optional backup of the merged file\n\n## Installation\n\n### Homebrew\n\n```\nbrew install ec\n```\n\n### Npm\n\n```bash\nnpm install -g @chojs23/ec\n```\n\nOr run without installing:\n\n```bash\nnpx @chojs23/ec\n```\n\nThe npm package is a thin installer that downloads the matching prebuilt\nbinary from GitHub Releases at install time. Set `EC_SKIP_DOWNLOAD=1` to\nskip the postinstall download in restricted environments.\n\n### Nix\n\nInstall the packaged release from nixpkgs:\n\n```bash\nnix profile add nixpkgs#ec\n```\n\nRun the latest repo state without installing:\n\n```bash\nnix run github:chojs23/ec\n```\n\nInstall the latest repo state into your profile:\n\n```bash\nnix profile add github:chojs23/ec\n```\n\nThe nixpkgs package can lag behind the latest upstream release. Use the direct\nrepo commands above if you want the newest branch or tag immediately.\n\n### Install script\n\nYou can run the installer through Make:\n\n```\nmake install\n```\n\n- On Windows, this runs `scripts/install.ps1`.\n- On Linux/macOS, this runs `scripts/install.sh`.\n",
  "github_repo": "chojs23/ec",
  "github_stars": 266,
  "github_topics": [
    "cli",
    "conflict",
    "conflict-resolution",
    "diff3",
    "git",
    "go",
    "golang",
    "merge-conflict",
    "mergetool",
    "neovim",
    "terminal",
    "tui"
  ],
  "homepage": "https://github.com/chojs23/ec",
  "homepage_og_description": null,
  "homepage_og_image": null,
  "homepage_title": null,
  "installs_30d": 104,
  "installs_365d": 104,
  "installs_90d": 104,
  "keg_only": 0,
  "keg_only_reason": null,
  "last_seen": "2026-06-20T23:34:18+00:00",
  "license": "MIT",
  "llm_generated_at": null,
  "llm_model": null,
  "name": "ec",
  "oldnames": [],
  "one_liner": null,
  "optional_dependencies": [],
  "rank_30d": 3412,
  "rank_365d": 9074,
  "rank_90d": 5508,
  "raw_hash": "2bcfbb51caa8736b",
  "recommended_dependencies": [],
  "revision": 0,
  "ruby_source_path": "Formula/e/ec.rb",
  "tap": "homebrew/core",
  "test_dependencies": [],
  "uses_from_macos": [],
  "version_head": null,
  "version_stable": "0.3.3",
  "versioned_formulae": [],
  "why_use_this": null
}