Mercurial > dotfiles

changeset 87:b958738c16f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix an oops in the .hgrc.
author Augie Fackler <durin42@gmail.com>
date Thu, 16 Apr 2009 14:56:15 -0500
parents 68f53fa09e99
children 79eec81404c3
files .hgrc
diffstat 1 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgrc
+++ b/.hgrc
@@ -14,10 +14,14 @@ hgext.rebase=
 hgext.record=
 hgext.transplant=
 # hgext.zeroconf=
-hgsubversion=/Stuff/hgsubversion
+hgsubversion=
 hggit=
 histedit=
 
+[merge-tools]
+filemerge.executable = opendiff-w
+filemerge.args = $local $other -ancestor $base -merge $output
+
 [alias]
 ll=log --graph -l 6