TRAGEDY: my favorite mergetool (BeyondCompare) requires different licenses for different platforms, and while I’ve had a license for the Mac version since 2014, it doesn’t work on windows
March 12, 2024 at 8:44 PM
TRAGEDY: my favorite mergetool (BeyondCompare) requires different licenses for different platforms, and while I’ve had a license for the Mac version since 2014, it doesn’t work on windows
🐧 **ec – terminal Git mergetool**
ec (easy-conflict) is a terminal Git mergetool with a 3-way TUI and Neovim integration. The post ec – terminal Git mergetool appeared first on LinuxLinks.
📰 Source: LinuxLinks
🔗 Link: https://www.linuxlinks.com/ec-terminal-git-mergetool/
#linux #opensource
ec (easy-conflict) is a terminal Git mergetool with a 3-way TUI and Neovim integration. The post ec – terminal Git mergetool appeared first on LinuxLinks.
📰 Source: LinuxLinks
🔗 Link: https://www.linuxlinks.com/ec-terminal-git-mergetool/
#linux #opensource
ec – terminal Git mergetool
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.
Features include:
* 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
Click animation for full size
ec is written in Go. Learn Go with our recommended **free books** and **free tutorials**.
**Return to Git Tools**
* * *
**Popular series**
---
| The largest compilation of the **best free and open source software** in the universe. Each article is supplied with a legendary ratings chart helping you to make informed decisions.
| Hundreds of **in-depth reviews** offering our unbiased and expert opinion on software. We offer helpful and impartial information.
| **The Big List of Active Linux Distros** is a large compilation of actively developed Linux distributions.
| Replace proprietary software with open source alternatives: **Google**, **Microsoft**, **Apple**, **Adobe**, **IBM**, **Autodesk**, **Oracle**, **Atlassian**, **Corel**, **Cisco**, **Intuit**, **SAS**, **Progress**, **Salesforce**, and **Citrix**
| **Awesome Free Linux Games Tools** showcases a series of tools that making gaming on Linux a more pleasurable experience. This is a new series.
| **Machine Learning** explores practical applications of machine learning and deep learning from a Linux perspective. We've written reviews of more than 40 self-hosted apps. All are free and open source.
| New to Linux? Read our **Linux for Starters series**. We start right at the basics and teach you everything you need to know to get started with Linux.
| **Alternatives to popular CLI tools** showcases essential tools that are modern replacements for core Linux utilities.
| **Essential Linux system tools** focuses on small, indispensable utilities, useful for system administrators as well as regular users.
| Linux utilities to maximise your **productivity**. Small, indispensable tools, useful for anyone running a Linux machine.
| Surveys popular streaming services from a Linux perspective: **Amazon Music Unlimited**, **Myuzi**, **Spotify**, **Deezer**, **Tidal**.
| **Saving Money with Linux** looks at how you can reduce your energy bills running Linux.
| Home computers became commonplace in the 1980s. **Emulate home computers** including the Commodore 64, Amiga, Atari ST, ZX81, Amstrad CPC, and ZX Spectrum.
| **Now and Then** examines how promising open source software fared over the years. It can be a bumpy ride.
| **Linux at Home** looks at a range of home activities where Linux can play its part, making the most of our time at home, keeping active and engaged.
| **Linux Candy** reveals the lighter side of Linux. Have some fun and escape from the daily drudgery.
| **Getting Started with Docker** helps you master Docker, a set of platform as a service products that delivers software in packages called containers.
| **Best Free Android Apps**. We showcase free Android apps that are definitely worth downloading. There's a strict eligibility criteria for inclusion in this series.
| These **best free books** accelerate your learning of every programming language. Learn a new language today!
| These **free tutorials** offer the perfect tonic to our free programming books series.
| **Linux Around The World** showcases usergroups that are relevant to Linux enthusiasts. Great ways to meet up with fellow enthusiasts.
| **Stars and Stripes** is an occasional series looking at the impact of Linux in the USA.
www.linuxlinks.com
March 12, 2026 at 8:52 AM
🐧 **ec – terminal Git mergetool**
ec (easy-conflict) is a terminal Git mergetool with a 3-way TUI and Neovim integration. The post ec – terminal Git mergetool appeared first on LinuxLinks.
📰 Source: LinuxLinks
🔗 Link: https://www.linuxlinks.com/ec-terminal-git-mergetool/
#linux #opensource
ec (easy-conflict) is a terminal Git mergetool with a 3-way TUI and Neovim integration. The post ec – terminal Git mergetool appeared first on LinuxLinks.
📰 Source: LinuxLinks
🔗 Link: https://www.linuxlinks.com/ec-terminal-git-mergetool/
#linux #opensource
Actually yeah surely there should be a git-mergetool implementation based on @simonwillison.net’s llm CLI
December 7, 2024 at 2:11 PM
Actually yeah surely there should be a git-mergetool implementation based on @simonwillison.net’s llm CLI
In your terminal: opendiff. It's a part of xcode. I've used that as my merge solver since like 2009 or so.
The xcode-select is likely not needed if your dev environment is somewhat standard on a Mac. A modern isolated env might hide it from you, though.
stackoverflow.com/a/25625663
The xcode-select is likely not needed if your dev environment is somewhat standard on a Mac. A modern isolated env might hide it from you, though.
stackoverflow.com/a/25625663
How to use opendiff as default mergetool
Hi I am trying to use opendiff as the git mergetool, but when I run mergetool I get this error message:
The merge tool opendiff is not available as 'opendiff'
What am I doing wrong? It was workin...
stackoverflow.com
April 15, 2026 at 3:10 PM
In your terminal: opendiff. It's a part of xcode. I've used that as my merge solver since like 2009 or so.
The xcode-select is likely not needed if your dev environment is somewhat standard on a Mac. A modern isolated env might hide it from you, though.
stackoverflow.com/a/25625663
The xcode-select is likely not needed if your dev environment is somewhat standard on a Mac. A modern isolated env might hide it from you, though.
stackoverflow.com/a/25625663
Easy AI tool idea: A git difftool mergetool to resolve git conflicts, could use history context and should be pretty strong at the job
March 9, 2025 at 9:37 PM
Easy AI tool idea: A git difftool mergetool to resolve git conflicts, could use history context and should be pretty strong at the job
Here's Retcon 1.6.1, with an assortment of fixes, but also a few new features and improvements. Update now for a nicer time!
May 13, 2026 at 8:09 AM
Here's Retcon 1.6.1, with an assortment of fixes, but also a few new features and improvements. Update now for a nicer time!
7️⃣ Stuck in a Merge Conflict Nightmare?
Merge conflicts can be scary, but Git shows you what changed.
Fix it:
- git status # See which files have conflicts
- git mergetool # Use a merge tool
- git add <resolved-files>
- git commit
Merge conflicts can be scary, but Git shows you what changed.
Fix it:
- git status # See which files have conflicts
- git mergetool # Use a merge tool
- git add <resolved-files>
- git commit
February 11, 2025 at 2:06 PM
7️⃣ Stuck in a Merge Conflict Nightmare?
Merge conflicts can be scary, but Git shows you what changed.
Fix it:
- git status # See which files have conflicts
- git mergetool # Use a merge tool
- git add <resolved-files>
- git commit
Merge conflicts can be scary, but Git shows you what changed.
Fix it:
- git status # See which files have conflicts
- git mergetool # Use a merge tool
- git add <resolved-files>
- git commit
I can recommend `git help rerere` and `vimdiff` for conflict resolution, and sanity;
- `git config set --global merge.tool vimdiff`
- `git mergetool` ← to use merge tool
- `]c` and `[c` ← `vimdiff` motions to move to conflicting hunks
- `:diffget [buffspec]` ← apply local/remote changes to hunk
- `git config set --global merge.tool vimdiff`
- `git mergetool` ← to use merge tool
- `]c` and `[c` ← `vimdiff` motions to move to conflicting hunks
- `:diffget [buffspec]` ← apply local/remote changes to hunk
September 23, 2025 at 5:13 PM
I can recommend `git help rerere` and `vimdiff` for conflict resolution, and sanity;
- `git config set --global merge.tool vimdiff`
- `git mergetool` ← to use merge tool
- `]c` and `[c` ← `vimdiff` motions to move to conflicting hunks
- `:diffget [buffspec]` ← apply local/remote changes to hunk
- `git config set --global merge.tool vimdiff`
- `git mergetool` ← to use merge tool
- `]c` and `[c` ← `vimdiff` motions to move to conflicting hunks
- `:diffget [buffspec]` ← apply local/remote changes to hunk
今日はgit mergetoolを覚えた&自分のneovimで開くように設定した。いままでコンフリクトしたファイルをそのままひらいてた。
October 27, 2023 at 10:56 AM
今日はgit mergetoolを覚えた&自分のneovimで開くように設定した。いままでコンフリクトしたファイルをそのままひらいてた。
pretty sure the idea with `git mergetool` was that languages would define their own merge semantics outside of git, but in practice I haven’t seen people talk about good merge tool implementations or workflows
November 1, 2024 at 2:16 PM
pretty sure the idea with `git mergetool` was that languages would define their own merge semantics outside of git, but in practice I haven’t seen people talk about good merge tool implementations or workflows
マージコンフリクト解決のためのTUIツール。easy conflictを略してecと。Go実装
GitHub - chojs23/ec: Easy terminal-native 3-way git conflict resolver vim-like workflow
Easy terminal-native 3-way git mergetool vim-like workflow - chojs23/ec
github.com
June 7, 2026 at 10:46 AM
マージコンフリクト解決のためのTUIツール。easy conflictを略してecと。Go実装
btw, these are some of my favorite git aliases for BeyondCompare, they might work for your difftool as well:
* git e OTHER - compares the current working directory against another clean commit/branch/tag checkout
* git e2 LEFT RIGHT - do a diff of two commits/branches/tags
script text in alt text
* git e OTHER - compares the current working directory against another clean commit/branch/tag checkout
* git e2 LEFT RIGHT - do a diff of two commits/branches/tags
script text in alt text
![[alias]
lg = log --color --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cI) %C(bold blue)<%an>%Creset' --abbrev-commit --
e = !sh diffref.sh
e2 = !sh diff2ref.sh
[diff]
tool = bc3
[difftool "bc3"]
trustExitCode = true
[merge]
tool = bc3
[mergetool "bc3"]
trustExitCode = true](https://cdn.bsky.app/img/feed_thumbnail/plain/did:plc:rqm4qgf6jdmb35mxatuzi6cq/bafkreiamhkdle3tcioc2vh5wnisd7dkw5asa7jqvrgpank4fqabeexwpkm)
January 18, 2025 at 8:03 AM
btw, these are some of my favorite git aliases for BeyondCompare, they might work for your difftool as well:
* git e OTHER - compares the current working directory against another clean commit/branch/tag checkout
* git e2 LEFT RIGHT - do a diff of two commits/branches/tags
script text in alt text
* git e OTHER - compares the current working directory against another clean commit/branch/tag checkout
* git e2 LEFT RIGHT - do a diff of two commits/branches/tags
script text in alt text
GitComet launch!
It’s a fast, local-first, open-source Git client for Linux, macOS, and Windows, built for people working in large repos who still want familiar Git workflows.
Diffs, merge tools, worktrees, history, and `git difftool` / `git mergetool` support.
gitcomet.dev
It’s a fast, local-first, open-source Git client for Linux, macOS, and Windows, built for people working in large repos who still want familiar Git workflows.
Diffs, merge tools, worktrees, history, and `git difftool` / `git mergetool` support.
gitcomet.dev
GitComet | Fast Open Source Git GUI for Linux, macOS, and Windows
GitComet is a fast open source Git GUI for Linux, macOS, and Windows, with focused diff and merge tooling and familiar Git workflows.
gitcomet.dev
March 18, 2026 at 2:27 PM
GitComet launch!
It’s a fast, local-first, open-source Git client for Linux, macOS, and Windows, built for people working in large repos who still want familiar Git workflows.
Diffs, merge tools, worktrees, history, and `git difftool` / `git mergetool` support.
gitcomet.dev
It’s a fast, local-first, open-source Git client for Linux, macOS, and Windows, built for people working in large repos who still want familiar Git workflows.
Diffs, merge tools, worktrees, history, and `git difftool` / `git mergetool` support.
gitcomet.dev
I've been using delta/bat ( github.com/dandavison/d... ).
`n` and `N` let you navigate files.
And `git diff -p | cat` still works when I need raw output.
Here's some .gitconfig I've accumulated over the years. Not sure what all it does but it works for me.
`n` and `N` let you navigate files.
And `git diff -p | cat` still works when I need raw output.
Here's some .gitconfig I've accumulated over the years. Not sure what all it does but it works for me.
![Screenshot of syntax highlit gitconfig file.
[core]
editor = emacs
commentChar = ~
pager = delta
excludesFile = /Users/mikesamuel/.git/ignore
[gpg]
program = gpg
[http]
cookiefile = /Users/mikesamuel/.gitcookies
[commit]
gpgsign = true
gpsign = true
[push]
default = simple
autoSetupRemote = true
[merge]
tool = meld
conflictstyle = diff3
[mergetool "meld"]
cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"
[credential]
helper = osxkeychain
[pull]
rebase = false
[filter "lfs"]
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
[tag]
forceSignAnnotated = true
# Use ssh when loading submodules from https://github.com/
# https://stackoverflow.com/a/50299434/20394
[url "git@github.com:"]
insteadOf = https://github.com/
[init]
defaultBranch = main
[interactive]
diffFilter = delta --color-only
[delta]
navigate = true # use n and N to move between diff sections
#light = true # or dark = true, or omit for auto-detection
side-by-side = true](https://cdn.bsky.app/img/feed_thumbnail/plain/did:plc:xnx52zdoyuf777kntfughiwa/bafkreiezlgy2jhuvt3o6h6vdoztzzztz7ivn7dqix62dipi43k4r5kyhta)
July 9, 2025 at 4:07 PM
I've been using delta/bat ( github.com/dandavison/d... ).
`n` and `N` let you navigate files.
And `git diff -p | cat` still works when I need raw output.
Here's some .gitconfig I've accumulated over the years. Not sure what all it does but it works for me.
`n` and `N` let you navigate files.
And `git diff -p | cat` still works when I need raw output.
Here's some .gitconfig I've accumulated over the years. Not sure what all it does but it works for me.
August 2, 2026 at 5:25 PM
Estoy probando diffview, un plugin de Neovim
para ver los cambios entre ramas, parches, mergetool, etc. Y es súper fácil de usar y ligero. Lo recomiendo totalmente.
Lo puedes instalar así:
" Plug
Plug 'sindrets/diffview.nvim'
para ver los cambios entre ramas, parches, mergetool, etc. Y es súper fácil de usar y ligero. Lo recomiendo totalmente.
Lo puedes instalar así:
" Plug
Plug 'sindrets/diffview.nvim'
July 21, 2026 at 8:03 PM
Estoy probando diffview, un plugin de Neovim
para ver los cambios entre ramas, parches, mergetool, etc. Y es súper fácil de usar y ligero. Lo recomiendo totalmente.
Lo puedes instalar así:
" Plug
Plug 'sindrets/diffview.nvim'
para ver los cambios entre ramas, parches, mergetool, etc. Y es súper fácil de usar y ligero. Lo recomiendo totalmente.
Lo puedes instalar así:
" Plug
Plug 'sindrets/diffview.nvim'
🍻 ec 🍻
TUI 3-way git mergetool
🔗 https://github.com/chojs23/ec
#homebrew #newpkg #macos #linux #formula
TUI 3-way git mergetool
🔗 https://github.com/chojs23/ec
#homebrew #newpkg #macos #linux #formula
June 8, 2026 at 1:54 PM
🍻 ec 🍻
TUI 3-way git mergetool
🔗 https://github.com/chojs23/ec
#homebrew #newpkg #macos #linux #formula
TUI 3-way git mergetool
🔗 https://github.com/chojs23/ec
#homebrew #newpkg #macos #linux #formula
こんな感じを.gitconfigに追加する
[merge]
tool = vimdiff
[mergetool]
cmd = "nvim -d $MERGED $LOCAL $REMOTE -c 'wincmd J | wincmd ='"
[mergetool]
keepBackup = false
[merge]
tool = vimdiff
[mergetool]
cmd = "nvim -d $MERGED $LOCAL $REMOTE -c 'wincmd J | wincmd ='"
[mergetool]
keepBackup = false
October 27, 2023 at 11:29 AM
こんな感じを.gitconfigに追加する
[merge]
tool = vimdiff
[mergetool]
cmd = "nvim -d $MERGED $LOCAL $REMOTE -c 'wincmd J | wincmd ='"
[mergetool]
keepBackup = false
[merge]
tool = vimdiff
[mergetool]
cmd = "nvim -d $MERGED $LOCAL $REMOTE -c 'wincmd J | wincmd ='"
[mergetool]
keepBackup = false
Thing is, merges are annoying but not so annoying that I’d be willing to change flow.
Actually, they are annoying *because* they break flow while I’m trying to do a thing.
I’d rather use merde as an automatic mergetool, maybe with a /dev/terminal review screen.
Actually, they are annoying *because* they break flow while I’m trying to do a thing.
I’d rather use merde as an automatic mergetool, maybe with a /dev/terminal review screen.
January 30, 2025 at 6:18 PM
Thing is, merges are annoying but not so annoying that I’d be willing to change flow.
Actually, they are annoying *because* they break flow while I’m trying to do a thing.
I’d rather use merde as an automatic mergetool, maybe with a /dev/terminal review screen.
Actually, they are annoying *because* they break flow while I’m trying to do a thing.
I’d rather use merde as an automatic mergetool, maybe with a /dev/terminal review screen.
TIL: I just figured out how to *actually* use git mergetool to fix merge/rebase conflicts. Better late than never ;) #thx to beyond compare!
November 16, 2024 at 6:12 AM
TIL: I just figured out how to *actually* use git mergetool to fix merge/rebase conflicts. Better late than never ;) #thx to beyond compare!
my only alternative has been setting vimdiff as a mergetool. not sure if my issue with vscode's thing was because i was using the neovim plugin and it didn't play well enough with neovim or what-- occasionally i would make what seemed to be complete edits, and it broke the merge
January 4, 2024 at 4:35 PM
my only alternative has been setting vimdiff as a mergetool. not sure if my issue with vscode's thing was because i was using the neovim plugin and it didn't play well enough with neovim or what-- occasionally i would make what seemed to be complete edits, and it broke the merge
Although on a closer examination, it currently only does diffs despite calling itself a "mergetool" in the README. Becoming an actual merge tool is on the roadmap, but not yet implemented.
June 19, 2026 at 5:19 AM
Although on a closer examination, it currently only does diffs despite calling itself a "mergetool" in the README. Becoming an actual merge tool is on the roadmap, but not yet implemented.
vimdiff used to be the main option. Emacs also has options, but they are annoying to set up.
But here's a brand new tool somebody is developing:
github.com/chojs23/ec
But here's a brand new tool somebody is developing:
github.com/chojs23/ec
GitHub - chojs23/ec: Easy terminal-native 3-way git mergetool vim-like workflow
Easy terminal-native 3-way git mergetool vim-like workflow - chojs23/ec
github.com
June 15, 2026 at 9:11 PM
vimdiff used to be the main option. Emacs also has options, but they are annoying to set up.
But here's a brand new tool somebody is developing:
github.com/chojs23/ec
But here's a brand new tool somebody is developing:
github.com/chojs23/ec
Hey #DirectionsEMEA If you want to take a peek at the #msdyn365bc Field Guide book, you can find it at the @Mergetool booth, they have a stack :)
November 16, 2024 at 5:26 PM
Hey #DirectionsEMEA If you want to take a peek at the #msdyn365bc Field Guide book, you can find it at the @Mergetool booth, they have a stack :)