Mercurial > dotfiles
annotate unixSoft/hgrc-opendiff @ 378:20e47bc8eea9
hgrc: disable hg-git and hgsubversion
It hasn't been common for me to use either of these extensions for
some time, so just drop both of them from the main hgrc. Instead I'll
enable them as-needed in individual repositories.
author | Augie Fackler <durin42@gmail.com> |
---|---|
date | Thu, 09 Jun 2011 20:20:04 -0500 |
parents | a5ec16bba8a9 |
children |
rev | line source |
---|---|
261
a5ec16bba8a9
hgrc: move opendiff support to another file to stop breaking merge on linux
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
1 # This is broken into its own file on account of not being able to |
a5ec16bba8a9
hgrc: move opendiff support to another file to stop breaking merge on linux
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
2 # properly make opendiff-w bail when opendiff is unavailable. |
a5ec16bba8a9
hgrc: move opendiff support to another file to stop breaking merge on linux
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
3 [merge-tools] |
a5ec16bba8a9
hgrc: move opendiff support to another file to stop breaking merge on linux
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
4 filemerge.priority = 100 |
a5ec16bba8a9
hgrc: move opendiff support to another file to stop breaking merge on linux
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
5 filemerge.executable = opendiff-w |
a5ec16bba8a9
hgrc: move opendiff support to another file to stop breaking merge on linux
Augie Fackler <durin42@gmail.com>
parents:
diff
changeset
|
6 filemerge.args = $local $other -ancestor $base -merge $output |