opendiff(1) BSD General Commands Manual opendiff(1)NAME
opendiff -- Use FileMerge to graphically compare or merge file or directories
SYNOPSIS
opendiff file1 file2 [-ancestor ancestorFile] [-merge mergeFile]
opendiff dir1 dir2 [-ancestor ancestorDirectory] [-merge mergeDirectory]
DESCRIPTION
opendiff is a command line utility that provides a convenient way to launch the FileMerge application from Terminal to graphically compare
files or directories. If FileMerge is already running, opendiff will connect to that running instance for the new comparison. opendiff
exits immediately after the comparison request has been sent to FileMerge.
opendiff and FileMerge can be used to compare two files file1 and file2 or to compare two directories dir1 and dir2.
If the -ancestor flag is given, FileMerge will compare the two files or directories to a common ancestor. This is useful if two people inde-
pendently modify copies of a single original file or directory.
FileMerge lets you merge two files or directories together to create a third file or directory. To see the contents of a merged file, drag
the splitter bar at the bottom of FileMerge's file comparison window. The contents of the merged file can be directly edited within File-
Merge. After editing, the merged file can be saved to the file (or into the directory) specified with the Fl merge flag. If a destination
is not specified with the -merge flag, FileMerge will ask for a destination file or directory when you try to save a merged file.
For further information, please consult the Help information available from the FileMerge application.
FILES
/Developer/Applications/Utilities/FileMerge.app
opendiff and FileMerge are installed as part of the Mac OS X Developer Tools.
SEE ALSO diff(1), diff3(1), cmp(1)Mac OS X August 3, 2004 Mac OS X
Check Out this Related Man Page
GIT-MERGETOOL(1) Git Manual GIT-MERGETOOL(1)NAME
git-mergetool - Run merge conflict resolution tools to resolve merge conflicts
SYNOPSIS
git mergetool [--tool=<tool>] [-y|--no-prompt|--prompt] [<file>...]
DESCRIPTION
Use git mergetool to run one of several merge utilities to resolve merge conflicts. It is typically run after git merge.
If one or more <file> parameters are given, the merge tool program will be run to resolve differences on each file (skipping those without
conflicts). Specifying a directory will include all unresolved files in that path. If no <file> names are specified, git mergetool will run
the merge tool program on every file with merge conflicts.
OPTIONS -t <tool>, --tool=<tool>
Use the merge resolution program specified by <tool>. Valid merge tools are: araxis, bc3, diffuse, ecmerge, emerge, gvimdiff, kdiff3,
meld, opendiff, p4merge, tkdiff, tortoisemerge, vimdiff and xxdiff.
If a merge resolution program is not specified, git mergetool will use the configuration variable merge.tool. If the configuration
variable merge.tool is not set, git mergetool will pick a suitable default.
You can explicitly provide a full path to the tool by setting the configuration variable mergetool.<tool>.path. For example, you can
configure the absolute path to kdiff3 by setting mergetool.kdiff3.path. Otherwise, git mergetool assumes the tool is available in PATH.
Instead of running one of the known merge tool programs, git mergetool can be customized to run an alternative program by specifying
the command line to invoke in a configuration variable mergetool.<tool>.cmd.
When git mergetool is invoked with this tool (either through the -t or --tool option or the merge.tool configuration variable) the
configured command line will be invoked with $BASE set to the name of a temporary file containing the common base for the merge, if
available; $LOCAL set to the name of a temporary file containing the contents of the file on the current branch; $REMOTE set to the
name of a temporary file containing the contents of the file to be merged, and $MERGED set to the name of the file to which the merge
tool should write the result of the merge resolution.
If the custom merge tool correctly indicates the success of a merge resolution with its exit code, then the configuration variable
mergetool.<tool>.trustExitCode can be set to true. Otherwise, git mergetool will prompt the user to indicate the success of the
resolution after the custom tool has exited.
-y, --no-prompt
Don't prompt before each invocation of the merge resolution program.
--prompt
Prompt before each invocation of the merge resolution program. This is the default behaviour; the option is provided to override any
configuration settings.
TEMPORARY FILES
git mergetool creates *.orig backup files while resolving merges. These are safe to remove once a file has been merged and its git
mergetool session has completed.
Setting the mergetool.keepBackup configuration variable to false causes git mergetool to automatically remove the backup as files are
successfully merged.
GIT
Part of the git(1) suite
Git 1.7.10.4 11/24/2012 GIT-MERGETOOL(1)