Mercurial > ec-dotfiles

comparison hg @ 10:876f2c45eeae

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use vimdiff for merging.
author Edho Prima Arief <me@myconan.net>
date Tue, 03 Aug 2010 21:14:35 +0700
parents cd87be0968d9
children 48e869de3ebe
comparison
equal deleted inserted replaced
9:bb4a42a4c7bb 10:876f2c45eeae
1 [ui] 1 [ui]
2 username = Edho Prima Arief <me@myconan.net> 2 username = Edho Prima Arief <me@myconan.net>
3 merge = vimdiff
4
5 [merge-tools]
6 vimdiff.executable = vim
7 vimdiff.args = -d $base $local $output $other +close +close
8