# HG changeset patch
# User Augie Fackler <durin42@gmail.com>
# Date 1281979839 18000
# Node ID a5ec16bba8a956ea228a2bb60e749de75b5aebb4
# Parent  26f9c18b588cd9b563320fa2231324266bf4942d
hgrc: move opendiff support to another file to stop breaking merge on linux

diff --git a/.hgrc b/.hgrc
--- a/.hgrc
+++ b/.hgrc
@@ -19,10 +19,6 @@ hgsubversion=
 hg_histedit=
 hg_remotebranches=
 
-[merge-tools]
-filemerge.executable = opendiff-w
-filemerge.args = $local $other -ancestor $base -merge $output
-
 [alias]
 ll=log --graph --style compact --limit 6 -r 'sort((::. or bookmark() or heads(upstream())), "-rev")'
 upstream-bookmarks = log -r 'bookmark() and upstream()' --template '{bookmarks}\n'
diff --git a/unixSoft/hgrc-opendiff b/unixSoft/hgrc-opendiff
new file mode 100644
--- /dev/null
+++ b/unixSoft/hgrc-opendiff
@@ -0,0 +1,6 @@
+# This is broken into its own file on account of not being able to
+# properly make opendiff-w bail when opendiff is unavailable.
+[merge-tools]
+filemerge.priority = 100
+filemerge.executable = opendiff-w
+filemerge.args = $local $other -ancestor $base -merge $output