+
−# 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