Active1 year, 3 months ago
On Windows, there is TortoiseMerge tool that's able to open patch files (the files produced by git patch / diff -u, etc...), and then act as a visual diff utility to select/edit the patch chunks.
On linux, I've heard kompare does this.
On Mac, I haven't find any tool for this, so do you know any ?
PS: I'm not looking for diff tool which require giving you 2 or 3 files as input (since the patch I'm editing might not be valid, I can't apply the patch on a temporary subset of the file and diff manually).
xryl669xryl669
4 Answers
- Visual diff free download. WinMerge WinMerge is a Windows tool for visual difference display and merging, for both files and directories. To place configuration files into%APPDATA% directory under Windows •Improved support for Find/Replace •Improved Mac OS X support •Improved system integration under Windows •Improved encoding.
- 12 May 2014 Best visual diff tool on OS X Kaleidoscope, git, diff, FileMerge, opendiff, p4merge, and p4. If you know one please tell me. For the last couple of months I was trying various options for doing diffing and merging on Mac with git and perforce. Perforce itself has pretty good merging tool p4merge and people already know how to setup it with git.
The tool I work for (ECMerge), as a 'preview patch' feature. It lets you apply a (reverse-)patch on the file and produce the other side just visually, or simply 'tell' if it applied succesfully as a whole. While producing the other side, it can paste to the clipboard what was rejected. It has the usual options for context limitations and displaced application. Patch files have syntax colouring.
Once you could apply the patch as you wanted, you have a 2-way merge view so you can make a selection of what you finally want to apply, save or produce patches.
Posted by Todd Huss on Aug 17, 2011 in code, Git, Mac OS X, Software Development| 38 Comments Our favorite (and free) visual diff and merge tool for OS X (as well as Linux and Windows) is DiffMerge. 'Visual diff merge tool and folder compare ' Guiffy MacOS X is a visual file comparison tool which has a main pane and two further smaller panes at the bottom of the screen.
A visual diff, folder compare, and 3-way auto merge all-in-one tool. Guiffy features include the Trustworthy 3-way auto-merge a€” a€sSureMergea€t, In-Line difference highlighting, integrated folder and filetree comparisons, command line interface and API for automation, SCM integrations and application plug-ins. Guiffy produces reports as HTML with support for color printing.
This is not perfect but workable.
armel
armel2,08411 gold badge1616 silver badges2424 bronze badges
PatchViewer on Mac OS X (http://appledeveloper.com.au/products/patchviewer/) does part of what you are after (display patch files visually using whatever GUI diff tool you like), but it doesn't allow editing the patch file.
(Disclaimer: I am the author of PatchViewer.)
user2067021user2067021
You can use colordiff and pipe in the patch file. Not a GUI, but definitely way better than just trying to read the patch file.
brew install colordiffcat file.patch | colordiff | less -RS
Worked well for my needs. More info here: http://www.markusbe.com/2009/12/how-to-read-a-patch-or-diff-and-understand-its-structure-to-apply-it-manually/
Ben Baron
Ben Baron11.6k1111 gold badges4444 silver badges6262 bronze badges
The GitHub app for Mac does this, and it doesn't necessarily have to be used with GitHub.
a paid nerd
a paid nerd19.1k2828 gold badges110110 silver badges157157 bronze badges
Download For Mac Os X
Not the answer you're looking for? Browse other questions tagged macosuser-interfacediffpatch or ask your own question.
| Download32 Home | Software Categories | New Downloads | Top Downloads | Rss Feeds | Submit Software | Bookmark | Contact Us |
|
|
Development / Other
Guiffy SureMerge MacOS X - 9.6 |
Guiffy is a visual file compare diff tool, folder compare, and merge tool. Guiffy is a cross-platform application and component available for Windows, MacOS, Linux, and Unix platforms. This download includes an easy-to-use MacOS X installer.
| | Screenshot | | Download | | Order now | | Developer's site |
Broken Link?
|
|
| | Rating: | | Current Version: | 9.6 | | Release Date: | Nov 1, 2011 | | License: | Comercial | | Price: | $59 | | Downloads: | 282 |
| Download Now
(File Size: 7.8 MB ) |
|
|
| Software Description:
Guiffy SureMerge is a visual file compare Diff tool, Merge tool, and Folder compare tool all-in-one that makes comparing, merging, and upgrading sources as easy and reliable as possible. Guiffy's software comes with: command line interfaces, an API package, Eclipse and NetBeans plugins and Finder integration. Guiffy recognizes over 150 source file encoding formats (such as UTF8, UTF16, and many other mutlti-byte formats). Guiffy's advanced visual compare features include in-line difference highlighting and syntax highlighting for more than 20 source code languages. Guiffy's Trustworthy 3-way merge, SureMerge, was designed from day 1 to avoid all the problems that plague other 3-way diff based merge tools. SureMerge surpasses all other merge tools with its intelligent hybrid algorithms and ease-of-use. See our SureMerge White Paper which includes test kit files for evaluating 3-way merge tools. Guiffy's software is implemented entirely in Java with a Swing GUI. Its cross-platform and available for: Windows(2000, XP, 2003, Vista, Windows 7), MacOS X(PPC or Intel), Linux(any architecture or distribution), Unix(Solaris, HPUX, AIX, Others), and any Java-enabled platform. This download includes an easy-to-use MacOS X installer. | | Software Requirements: | | No specific requirements | | This software is designed to run on the following operating systems: | | Mac OS X | | Guiffy SureMerge MacOS X Keywords: | | Folder Compare, Diff Tool, Merge Tool, 3-way Merge, Visual File Compare | | Download Links of Guiffy SureMerge MacOS X 9.6: | - Guiffy SureMerge MacOS X - 9.6 (File Size: 7.8 MB)
- Guiffy SureMerge MacOS X - 9.6 (File Size: 7.8 MB)
|
| |
|
|
| | Reviews Summary: | Show All Reviews (0) |
| |
|
|
|
| Guiffy SureMerge MacOS X related software |
|---|
| Title / Version / Description | Size | License | Price | | Guiffy SureMerge Windows 9.6 | 8.8 MB | Comercial | $59 | | Guiffy SureMerge is a visual file compare Diff tool, Merge tool, and Folder compare tool all-in-one that makes comparing, merging, and upgrading sources as easy and reliable as possible. Guiffy's software comes with: command line interfaces, an API package, Eclipse and NetBeans plugins and Explorer integration. Guiffy recognizes over 150 source file encoding formats (such as UTF8, UTF16, and many other mutlti-byte formats). Guiffy's advanced... |
| | Guiffy SureMerge Linux 9.6 | 7.2 MB | Comercial | $59 | | Guiffy SureMerge is a visual file compare Diff tool, Merge tool, and Folder compare tool all-in-one that makes comparing, merging, and upgrading sources as easy and reliable as possible. Guiffy's software comes with: command line interfaces, an API package, Eclipse and NetBeans plugins and desktop integration. Guiffy recognizes over 150 source file encoding formats (such as UTF8, UTF16, and many other mutlti-byte formats). Guiffy's advanced... |
| | Compare And Merge 2.3 | 904.9 KB | Shareware | $39.95 | | Compare and Merge is a visual file and source code compare utility. It lets you see the differences between text files, and makes it easy to resolve these differences. For programmers, web developers, and anyone else who works with multiple revisions of files. New features: Quick Bar for faster compares, Smart Refresh mode, Explorer context menu, new options, various bug fixes and tweaks. |
| | Guiffy SureMerge 8.2 | 4.2 MB | Shareware | $75 | | At Guiffy our focus is Advanced Cross-Platform Diff/Merge software. Our product is a diff tool, merge tool, and folder compare tool all-in-one that makes comparing, merging, and upgrading sources as easy and reliable as possible. Guiffy is used around the world by thousands of professionals in more than 30 countries on an endless variety of platforms (Including: Windows, Linux, MacOS, and Unix). And, our downloads are packaged as... |
| | Visual diff and merge tool 2.1 | 10.9 MB | Freeware | | JMeld is a visual diff and merge tool. It is build to be fast with large files and runs on any operating system. |
|
|
|
| Other popular software in this category |
|---|
| Title / Version / Description | Size | License | Price | | GDIView 1 15 | 42.0 KB | Freeware | | GDIView is a unique tool that displays the list of GDI handles (brushes, pens, fonts, bitmaps, and others) opened by every process. It displays the total count for each type of GDI handle, as well as detailed information about each handle. This tool can be useful for developers that need to trace GDI resources leak in their software. |
| | Xoops - Comunidade Portuguesa 1.0 | 397.4 KB | Freeware | | Development and Documentation for the Xoops Project dedicated to the Xoops Portuguese Community, as well as some components developed for the XOOPS Project: http://sourceforge.net/projects/xoops/ |
| | prueba 1.0 | 0 | Freeware | | AraBoard is a set of software tools to support alternative and augmentative communication for building and playing communication boards. - AraBoard Constructor is a Software tool that allows you to construct and edit communication boards. - AraBoard Player is a Software tool that allows you to run communication boards previously created with AraBoard Constructor application. GNU General Public License version 3.0 (GPLv3) |
| | Altova UModel Professional Edition 2019r3sp1 | 96.8 MB | Demo | 129EUR | | Altova UModel Professional Edition is the starting point for successful software development. Use UModel to create and interpret software and SQL database designs via the power of UML. Design application and database models and generate Java, C#, or Visual Basic .NET code, and SQL scripts. Reverse engineer existing programs and databases into clear, accurate UML diagrams to quickly analyze legacy software. UModel can automatically generate... |
| | Altova UModel Enterprise Edition 2019r3sp1 | 97.3 MB | Demo | 199EUR | | Altova UModel Enterprise Edition is the starting point for successful software development. Use UModel to create software models and SQL database designs via the power of UML. Generate Java, C#, or Visual Basic .NET code, and SQL scripts from UML models. Reverse engineer existing programs and databases into clear, accurate UML diagrams to visually analyze legacy software. You can even revise your code or UML models and complete the round trip... |
|
|
|
| Latest Reviews |
|---|
| ConyEdit for Windows (reshim) - Dec 3, 2018 | | Programmers feel the comfort of coding using ConyEdit which is capable to edit codes in batch mode and supports most of programming language. | | Disc Cover Studio (harish) - Dec 19, 2017 | | No need to go for a professional designer for the cover of new record, you can do it on your own sitting at home PC adding your own image on it with the Disc Cover Studio. | | Kaspersky Security Scanner (Anthony) - Oct 12, 2017 | | Scans software to find whether it is harmful for computer and also checks for updates of security patches. | | Comodo Firewall (Maxmuller) - Sep 19, 2017 | | This just another awesome product from Comodo to protect your computer from unwanted inbound or outbound traffic, also helps you analyze data packets. | | TCP Splitter (Redrick) - Aug 10, 2017 | | This lets the data packets we send split into several packages which is convenient for many applications to receive those and process one after another. | | Project Viewer Lite (Tensialar) - Jul 19, 2017 | | This is a light weight software for viewing MS project files easily without the MS project installed, all the personal who are involved in the project can view this with graphics and charts. | | PDF Shaper Professional (Mortinus) - Jun 7, 2017 | | I had difficulties with the pdf documents which needed to be edited before presentation, then I got PDF Shaper which helped me to take the texts / images out and insert my own texts plus other images. | | Hotelare (Nielsine) - May 15, 2017 | | You can enable your guests book any room instantly through your website, also receive the payments, other sections of your hotel can be also handled using the this software like restaurants, accounts, hr etc. | | Copernic Desktop Search (Sokki) - Apr 19, 2017 | | It gives good result of any keyword you are looking for compared to standard default file search tool, finds from any file saved in your computer. | | SaferTech Secure Browser (Magaidh) - Apr 3, 2017 | | Integrated pop up and ad block facilities, secure all the online transactions by protecting secret programs leaking your personal information. |
|
|
|
|
Audio & Multimedia|Business Software|Development Tools|Education|Games|Graphics Software|Network & Internet|System Utilities|Mac Tools|Linux Programs
|
free. software downloads|Submit Software|Contact Us|Privacy Policy|Disclaimer|Link to Download32|Bookmark Us
|
All software information on this site, is solely based on what our users submit. Download32.com disclaims that any right and responsibility for the information go to the user who submit the software, games, drivers. Some software may not have details explanation or their price, program version updated. You should contact the provider/actual author of the software for any questions. There are also user reviews/comments posted about various software downloads, please contact us if you believe someone has posted copyrighted information contained on this web site. Copyright © 1996-2015 Download 32.
|