4 ms·
Maybe time to try Emacs? The diff support is great. And magit is native to Emacs.
by pama 3y ago
Maybe time to try Emacs? The diff support is great. And magit is native to Emacs.
- junke 3y agosmerge-refine is one keybinding I always use to highlight changes in 3-way diffs between base/mine, base/theirs, mine/theirs. The only problem is knowing what mine and theirs mean sometimes.
- aulin 3y agoAlso magit-ediff ('e' in any merge conflict) is great and maybe a little more intuitive than smerge