Mercurial > ec-dotfiles

changeset 10:876f2c45eeae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use vimdiff for merging.
author Edho Prima Arief <me@myconan.net>
date Tue, 03 Aug 2010 21:14:35 +0700
parents bb4a42a4c7bb
children 97f46d6a11d3
files hg
diffstat 1 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/hg	Fri Jul 23 21:18:07 2010 +0700
+++ b/hg	Tue Aug 03 21:14:35 2010 +0700
@@ -1,2 +1,8 @@
 [ui]
 username = Edho Prima Arief <me@myconan.net>
+merge = vimdiff
+
+[merge-tools]
+vimdiff.executable = vim
+vimdiff.args = -d $base $local $output $other +close +close
+