3 ms·
I much prefer Meld (http://meldmerge.org/ http://meldmerge.org/) when I want a graphical tool, but usually just edit the conflicts in vim.
by djmdjm 14y ago
I much prefer Meld (http://meldmerge.org/ http://meldmerge.org/) when I want a graphical tool, but usually just edit the conflicts in vim.
- nodata 14y agoOut of interest, do you have a good way to compare two parts of the same file using vimdiff without creating two files? Say a huge xml file with two nearly identical <parts></parts>?
- m0shen 14y agoYank the two parts into two new buffers (:vsplit) and do :diffthis in each
- benvd 14y agoI've actually never used a visual diff tool. Usually I just search the file for ">>>>>>>>>". Maybe I should check it out.