# HG changeset patch
# User Edho Prima Arief <me@myconan.net>
# Date 1280844904 -25200
# Node ID 97f46d6a11d335720b607c43fab5282f5a2500d6
# Parent  876f2c45eeaefca51d43d25f3e7416fade717b9f# Parent  8b52df75f9cb07fb25eeecca74ca0214bd473c02
Improved (as in, even more monstrous) ren.

diff -r 8b52df75f9cb -r 97f46d6a11d3 hg
--- a/hg	Tue Aug 03 20:32:55 2010 +0700
+++ b/hg	Tue Aug 03 21:15:04 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
+