vim-scripts / conflict2diff Goto Github PK
View Code? Open in Web Editor NEWTurns a CVS conflict file into a threeway diff
Home Page: http://www.vim.org/scripts/script.php?script_id=621
Turns a CVS conflict file into a threeway diff
Home Page: http://www.vim.org/scripts/script.php?script_id=621
This is a mirror of http://www.vim.org/scripts/script.php?script_id=621 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
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.