Differences between revisions 2 and 5 (spanning 3 versions)
Revision 2 as of 2008-09-23 02:22:14
Size: 1299
Editor: TomBa
Comment: add CategoryMac
Revision 5 as of 2009-05-19 19:31:01
Size: 742
Editor: localhost
Comment: converted to 1.6 markup
Deletions are marked like this. Additions are marked like this.
Line 2: Line 2:
To configure merge to use !FileMerge on Mac OS X, create a file called "opendiff-merge" with the following contents:
{{{
#!/bin/sh
# opendiff returns immediately, without waiting for FileMerge to exit.
# Piping the output makes opendiff wait for FileMerge.
opendiff $1 $3 -merge $1 -ancestor $2 | cat
}}}
Save this file into your shell's default path ($PATH). Because this is a shell script, you need to be sure it has execution permissions:
{{{
chmod +x opendiff-merge
}}}
Next look in your home directory for the following file ".hgrc". If it does not exist, create it. If it does exist, add the following to it:
{{{
[ui]
merge = opendiff-merge
}}}
The command "hg merge" will now use !FileMerge to resolve its conflicts.
Line 20: Line 3:
==== Better way in Mercurial 1.0 ====

U
se instead the same {{{opendiff-w}}} script as described in ExtdiffExtension:
To configure merge to use !FileMerge on Mac OS X, you can use the same {{{opendiff-w}}} script as described in ExtdiffExtension:
Line 30: Line 11:
Add the following to your {{{.hgrc}}} file: Make sure the script has executable permission, and is located in your {{{$PATH}}}.

Add the following to your [[.hgrc]] file:
Line 33: Line 16:
filemerge.executable = opendiff-w filemerge.executable = /full/path/to/opendiff-w
Line 36: Line 19:

The command "hg merge" will now use !FileMerge to resolve its conflicts.

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.

See also


CategoryMac

MacOSXFileMerge (last edited 2009-05-19 19:31:01 by localhost)