Mercurial > dotfiles
annotate unixSoft/hgrc-opendiff @ 477:8373f6924e50
emacs: kludge around a case of emacs being too clever for me
author | Augie Fackler <raf@durin42.com> |
---|---|
date | Thu, 21 Feb 2019 19:54:55 -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 |