Mercurial > ec-dotfiles

view hg @ 24:75c0cedc20ee

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Edho Prima Arief <me@myconan.net>
date Wed, 05 Jan 2011 16:23:12 +0700
parents 83fb6c590b38
children bbd189f52beb
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

[extensions]
hgext.convert =