Mercurial > dotfiles

diff unixSoft/hgrc-opendiff @ 261:a5ec16bba8a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
hgrc: move opendiff support to another file to stop breaking merge on linux
author Augie Fackler <durin42@gmail.com>
date Mon, 16 Aug 2010 12:30:39 -0500
parents
children
line wrap: on
line diff
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