Mercurial > ec-dotfiles

changeset 13:97f46d6a11d3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Improved (as in, even more monstrous) ren.
author Edho Prima Arief <me@myconan.net>
date Tue, 03 Aug 2010 21:15:04 +0700
parents 876f2c45eeae (diff) 8b52df75f9cb (current diff)
children 48e869de3ebe
files
diffstat 1 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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
+