Add filemerge as a merge tool.
| author |
Steve Losh <steve@stevelosh.com> |
| date |
Sun, 10 Jan 2010 18:01:10 -0500 |
| parents |
c924e638ae4b
|
| children |
377ad9ef7931
|
| branches/tags |
(none) |
| files |
.hgrc |
Changes
--- a/.hgrc Sun Jan 10 14:19:16 2010 -0500
+++ b/.hgrc Sun Jan 10 18:01:10 2010 -0500
@@ -35,6 +35,14 @@
[extdiff]
cmd.fmdiff = fmdiff
+[merge-patterns]
+** = filemerge
+
+[merge-tools]
+filemerge.executable = /Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
+filemerge.args = -left $other -right $local -ancestor $base -merge $output
+filemerge.gui = True
+
[email]
method = smtp
from = Steve Losh <steve@stevelosh.com>