Mercurial 1.0 has been out long enough that we can give only its instructions
converted to 1.6 markup
|Deletions are marked like this.||Additions are marked like this.|
|Line 13:||Line 13:|
|Add the following to your [:.hgrc] file:||Add the following to your [[.hgrc]] file:|
FileMerge on Mac OS X
To configure merge to use FileMerge on Mac OS X, you can use the same opendiff-w script as described in ExtdiffExtension:
# opendiff returns immediately, without waiting for FileMerge to exit. # Piping the output makes opendiff wait for FileMerge. opendiff "$@" | cat
Make sure the script has executable permission, and is located in your $PATH.
Add the following to your .hgrc file:
[merge-tools] filemerge.executable = /full/path/to/opendiff-w filemerge.args = $local $other -ancestor $base -merge $output
The command "hg merge" will now use FileMerge to resolve its conflicts.