Mercurial > ec-dotfiles

comparison hg @ 102:7a287a518718

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Edho Prima Arief <edho@myconan.net>
date Thu, 18 Aug 2011 15:20:54 +0700
parents e17886c8da43
children ed3d1b8e6f45
comparison
equal deleted inserted replaced
89:29bd7f6ef58a 102:7a287a518718
1 [ui] 1 [ui]
2 username = Edho Prima Arief <me@myconan.net> 2 username = Edho Prima Arief <edho@myconan.net>
3 merge = vimdiff 3 merge = vimdiff
4 verbose = true 4 verbose = true
5 5
6 [merge-tools] 6 [merge-tools]
7 vimdiff.executable = vim 7 vimdiff.executable = vim