da23e486e9b1
Add vimmerge.
| author | Steve Losh <steve@stevelosh.com> |
|---|---|
| date | Fri, 03 Jun 2011 13:06:33 -0400 |
| parents | 90ce20bf3d8b |
| children | b783542ecd34 |
| branches/tags | (none) |
| files | .hgrc |
Changes
--- a/.hgrc Wed Jun 01 13:33:35 2011 -0400 +++ b/.hgrc Fri Jun 03 13:06:33 2011 -0400 @@ -46,6 +46,7 @@ dwd = ssh://hg@bitbucket.org/dwaiter/ nyh = ssh://sjl@gotham.nyhacker.org/ dl = ssh://hg@hg.dwaiter.com:38038/ +mirr = ssh://hg@dwaiter.com:38038/mirror/ [diff] git = True @@ -60,6 +61,10 @@ opts.dd = [merge-tools] +vimmerge.executable = mvim +vimmerge.args = -f $output -c 'Conflict2Diff' +vimmerge.premerge = keep +vimmerge.priority = 1 [email] method = smtp