Conflict2Diff : Turns a CVS conflict file into a threeway diff
| script karma |
Rating 43/16,
Downloaded by 1731 |
Comments, bugs, improvements
|
Vim wiki
|
| created by |
| Chris Rimmer |
| |
| script type |
| utility |
| |
| description |
This plugin splits a CVS conflict file into three diff windows. The 2 conflicting versions of the file are put on the left and right. The central window contains the file, with each conflicting area replaced by "=======". Buffer specific mappings are set up to make the merging simple:
<Ctrl-Down> Move to the next conflict
<Ctrl-Up> Move to the previous conflict
<Ctrl-Left> Use the text from the lefthand file for this conflicting area
<Ctrl-Right> Use the text from the righthand file for this conflicting area
<Ctrl-q> Finish by closing the left and righthand windows, turning off diff and removing the mappings
|
| |
| install details |
| Unpack the files somewhere that vim can find them. You'll need to run the :helptags command to install the documentation. |
| |
script versions (upload new version)
Click on the package to download.
ip used for rating: 18.218.129.100
|
