|
Size: 1313
Comment: full path is needed if the user didn't add the file to the sh path
|
Size: 741
Comment: Mercurial 1.0 has been out long enough that we can give only its instructions
|
| 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 ==== Use 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 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.