# HG changeset patch
# User Edho Prima Arief <me@myconan.net>
# Date 1280844875 -25200
# Node ID 876f2c45eeaefca51d43d25f3e7416fade717b9f
# Parent  bb4a42a4c7bb9204dab31568bab01e614b02fa6c
Use vimdiff for merging.

diff -r bb4a42a4c7bb -r 876f2c45eeae hg
--- 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
+