Mercurial > ec-dotfiles
changeset 34:a914a2168196
Merge, removed git support.
author | Edho Prima Arief <me@myconan.net> |
---|---|
date | Sun, 27 Mar 2011 11:32:23 +0000 |
parents | 330587be514c |
children | a8dc309a1b8a |
files | hg |
diffstat | 1 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/hg Sun Mar 27 11:32:08 2011 +0000 +++ b/hg Sun Mar 27 11:32:23 2011 +0000 @@ -1,6 +1,7 @@ [ui] username = Edho Prima Arief <me@myconan.net> merge = vimdiff +verbose = true [merge-tools] vimdiff.executable = vim @@ -8,7 +9,4 @@ [extensions] hgext.convert = -hgext.bookmarks = -hgext.rebase = -hggit = - +progress =