2 ms·
A few things: 1. A third pane which shows a summary of all the diffs between the two compared files. It's point-and-clickable, and has a point-and-click bi-dir
by scelerat 8y ago
A few things:
1. A third pane which shows a summary of all the diffs between the two compared files. It's point-and-clickable, and has a point-and-click bi-directional Apply button to apply changes in either direction. Easy to arrow-key through the changes and apply the changes from the keyboard, too.
2. Character level diff -- not just different lines but will also show you characters which have changed.
3. Directory level diff shows files which have changed on a per-directory basis
BBedit integrates very easily with command line tools with the 'bbedit' and 'bbdiff' commands, so you can use it with difftool-type commands.
https://www.barebones.com/products/bbedit/bbedit11.html https://www.barebones.com/products/bbedit/bbedit11.html
- hboon 8y agoHmm, ok. Check out vim's `diffthis` and https://github.com/tpope/vim-fugitive https://github.com/tpope/vim-fugitive if you haven't. It sounds like it does the same thing. I'm suggesting this because you already use MacVim, so you'd get your familiar buffers and keystrokes, among other things.