vim-scripts / cvsconflict Goto Github PK
View Code? Open in Web Editor NEWCVS conflict resolution using vimdiff
Home Page: http://www.vim.org/scripts/script.php?script_id=1370
CVS conflict resolution using vimdiff
Home Page: http://www.vim.org/scripts/script.php?script_id=1370
This is a mirror of http://www.vim.org/scripts/script.php?script_id=1370 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://mysite.verizon.net/astronaut/vim/index.html#CVSCONFLICT)
A declarative, efficient, and flexible JavaScript library for building user interfaces.
๐ Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
An Open Source Machine Learning Framework for Everyone
The Web framework for perfectionists with deadlines.
A PHP framework for web artisans
Bring data to life with SVG, Canvas and HTML. ๐๐๐
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
Some thing interesting about web. New door for the world.
A server is a program made to process requests and deliver data to clients.
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
Some thing interesting about visualization, use data art
Some thing interesting about game, make everyone happy.
We are working to build community through open source technology. NB: members must have two-factor auth.
Open source projects and samples from Microsoft.
Google โค๏ธ Open Source for everyone.
Alibaba Open Source for everyone
Data-Driven Documents codes.
China tencent open source team.