Format a diff3-style merge conflict by showing its underlying changes separately.
License: MIT License
Format a diff3-style merge conflict by showing its underlying changes separately. Read more and try it out!
Github has recently separated the code lines from the plus signs in the diff view DOM, so that multiple lines can be selected and then copied, without having all the plus / minus signs in the copied text. It would be great if this feature could be added here as well.
Hi Philipp! Amazing tool, just what I was looking for.
It would be great if you could make the display of the comparisons wider, because unfortunately I have to deal with long lines.
I may be misunderstanding this, but to me, both diff views show »Base Version → Conflict A« (or B) [RENAMED]. Would it be possible to instead show the name of the branches/commits from the diff?
React
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
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
An Open Source Machine Learning Framework for Everyone
Django
The Web framework for perfectionists with deadlines.
Laravel
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.
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
Microsoft
Open source projects and samples from Microsoft.
Google
Google ❤️ Open Source for everyone.
Alibaba
Alibaba Open Source for everyone
D3
Data-Driven Documents codes.
Tencent
China tencent open source team.
