35b42a555d52
Remove merge tools.
| author | Steve Losh <steve@stevelosh.com> |
|---|---|
| date | Mon, 18 Jan 2010 18:58:32 -0500 |
| parents | 15633a0d4bd5 |
| children | 9d23f5158a1b a8af7beac4c2 |
| branches/tags | (none) |
| files | .hgrc |
Changes
--- a/.hgrc Mon Jan 18 15:24:41 2010 -0500 +++ b/.hgrc Mon Jan 18 18:58:32 2010 -0500 @@ -36,14 +36,6 @@ [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>