Search Results for "diff merge"

...Any change you make, large or small, even outside GitUp, is immediately reflected in GitUp's graph. No refreshing, no waiting. Highlight a commit and hit the spacebar to quickly see its message and diff. GitUp gives you full, transparent control over your local checkout, so it's easy to back out from unwanted changes. GitUp's Snapshot feature builds a Time-Machine-like history of every change made to your repo, allowing you to step backwards to any point in time. Rewrite, split, delete, and re-order commits, fixup and squash, cherry-pick, merge, rebase, etc. ...

YaDT - Yet another Diff Tool. It is another front-end for diff and in earlier versions diff3 utility. With YaDT you can compare and merge 2 and/or 3 files. YaDT is written on Tcl/Tk and wrapped in a single executable file with the help of sdx and tclkit. diff and cvs utilities are embedded inside YaDT. Also, YaDT supports Git and Mercurial repositories, but git and hg are not embedded inside YaDT, you should have git/hg executable in your path environment.

A diff/merge of two OWL ontologies.

Gives an overview (in a graphical-directory-view) where changes have to be done/expected on a three-way-diff. Not to be used for the actual diff/merge itself, but usefull to get an overview in advance.

A powerful class which allows to create and merge unified diff patches into any file. Fully written in PHP, uses the GNU standard unified diff format and allows any operation (creation/update/deletion).