All geek questions in one place

Visual Tool for Mac

Windows has the TortoiseMerge tool that can open patch files (files created with git patch / diff -u, etc.), and then act as a visual comparison utility to select / edit a patch of chunks.

On linux, I heard that kompare does this.

On a Mac, I did not find a tool for this, so do you know?

PS: I'm not looking for a diff tool that requires you to provide 2 or 3 files as input (since the fix I am editing may not be valid, I cannot apply the patch to a temporary subset of the file and diff manually).

+4
source share
3 answers

The tool I'm working for (ECMerge) as a preview function. It allows you to apply a patch (reverse) in a file, as well as visualize the other side or simply “tell” if it is applied as a whole. When creating the other side, it can paste into the clipboard what was rejected. It has the usual options for restricting context and moving applications. Patch files have syntax coloring.

Once you can apply the patch the way you want, you have a two-way merge view, so you can choose what you finally want to apply, save, or create corrections.

It is not perfect, but it is workable.

0
source

PatchViewer on Mac OS X ( http://appledeveloper.com.au/products/patchviewer/ ) does part of what you need (display patch files visually using any GUI demarcation tool you like), but it doesn't allow you to edit the patch file .

(Disclaimer: I am the author of PatchViewer.)

0
source

GitHub for Mac does this, and it does not have to be used with GitHub.

-1
source

Source: https://habr.com/ru/post/1437149/

More articles:


All Articles