How do you do a 3-way merge in FileMerge?
I see the option for specifying three files (left, right, and ancestor), but it doesn't seem to be possible to actually display the ancestor.
The bottom pane shows the result of the merge. I'd rather see what the original content was, so I could understand the context for the left and right sides of the conflict. Is this possible? FileMerge has awful help documentation.
Solution
To my knowledge, this is not possible with filemerge.
Paid (but very good) app: http://www.deltopia.com/
Open source: http://sourcegear.com/diffmerge/
- Programmatically retrieving the absolute path of an OS X command-line app
- Cocoa button opens a System Preference page
- sed command with -i option failing on Mac, but works on Linux
- NodeJS error "EMFILE, too many open files" on Mac OS
- How to open Visual Studio Code from the command line on OSX?
- error while build iOS app in Xcode : Sandbox: rsync.samba (13105) deny(1) file-write-create, Flutter failed to write to a file
- Is there really no mremap in Darwin?
- How do you connect to postgres running in a Docker container on OSx?
- Remove auto-generated __MACOSX folder from inside a zip file in Python
- This application failed to start because no Qt platform plugin could be initialized
- How to remove hidden MacOS files from a zip file?
- Difficulties installing casperjs on Mac
- Multiprocessing causes Python to crash and gives an error may have been in progress in another thread when fork() was called
- Where does IntelliJ store the JDKs that it downloads on my behalf?
- Open and close new tab with Selenium WebDriver in OS X
- How does Windows programming vary from Unix programing
- command line tools are already installed, use "Software Update" to install updates?
- Can I encode and decode a JSON on the GPU using MetalKit?
- VS Code shows red squiggles under "stdio.h" when workspace is in ~/src but not /tmp
- SSL module in Python is not available (on OSX)
- Package configuration not found despite sqlite3 being installed
- readelf-like tool for Mac OS X?
- Change Textfield placeholder color in SwiftUI on macOS
- White background added to all the text on my page (Firefox / Mac)
- Error running pyttsx3 code on OS X: "NameError: name 'objc' is not defined"
- OSX Lion AppleScript : How to get current space # from mission control?
- (mach-o file, but is an incompatible architecture (have 'arm64', need 'x86_64'))
- Git commit asks for OpenPGP secret key every time
- How do I find the "Preferences" menu in Eclipse in OS X?
- Using JDK that is bundled inside Android Studio as JAVA_HOME on Mac