view hg @ 10:876f2c45eeae

Use vimdiff for merging.
author Edho Prima Arief <me@myconan.net>
date Tue, 03 Aug 2010 21:14:35 +0700
parents cd87be0968d9
children 48e869de3ebe
line wrap: on
line source

[ui]
username = Edho Prima Arief <me@myconan.net>
merge = vimdiff

[merge-tools]
vimdiff.executable = vim
vimdiff.args = -d $base $local $output $other +close +close