CVSconflict : CVS conflict resolution using vimdiff
| script karma |
Rating 67/25,
Downloaded by 2421 |
Comments, bugs, improvements
|
Vim wiki
|
| created by |
| Charles Campbell |
| |
| script type |
| utility |
| |
| description |
CVS conflict resolution using vimdiff
When one does "cvs update", one may get files marked with "C" for conflict. Cvs was unable to automatically merge one's local version of such files with the repository's version, and so merging requires human intervention. The :CVSconflict command takes the current conflict file, splits it into two separate files, and enables vimdiff-style editing and viewing.
A command,
:CVSconflict
is provided which transforms the current file containing cvs conflict sections such as
<<<<<<<
...local version...
=======
...repository version...
>>>>>>>
into two side by side versions. Vim's diff mode is enabled with these two windows, greatly facilitating the production of a merged file.
(alpha/beta version available at http://www.drchip.org/astronaut/vim/index.html#CVSCONFLICT)
|
| |
| install details |
1. Place copy in your .vim/plugin (vimfiles\plugin) directory
2. gunzip CVSconflict.vim.gz
The file should automatically set up help the next time you fire up vim. |
| |
script versions (upload new version)
Click on the package to download.
| CVSconflict.vim.gz |
1 |
2005-09-29 |
6.0 |
Charles Campbell |
When one does "cvs update", one may get files marked with "C" for conflict. Cvs was unable to automatically merge one's local version with the repository, and merging requires human intervention. The :CVSconflict command takes the current conflict file, splits it into two separate files, and enables vimdiff-style editing and viewing.
|
ip used for rating: 142.132.191.50
|
