Hacker News new | ask | show | jobs
by johanvts 245 days ago
It shows you conflicting files. I normally resolve each via ediff or my IDE and then go back to magit. It’s not a diff/merge tool.
1 comments
ashton314 245 days ago
Ediff and smerge are both fun to use in Emacs.
link