changeset
Easier vimdiff defaults
Fri, 20 Jun 2014 01:58:35 -0400
- author
- Meredith Howard <mhoward@roomag.org>
- date
- Fri, 20 Jun 2014 01:58:35 -0400
- changeset 79
- 4635b3f5bc23
- parent 78
- cb0028ec05e3
- child 80
- e2d834280dae
Easier vimdiff defaults
| .hgrc | file | annotate | diff | comparison | revisions |
--- a/.hgrc +++ b/.hgrc @@ -1,5 +1,6 @@ [ui] username = Meredith Howard <mhoward@roomag.org> +merge = vimdiff [extensions] hgext.graphlog = @@ -17,4 +18,10 @@ pager = LESS='FSRX' less [alias] fetch = pull --rebase +[merge-tools] +vimdiff.executable = vim +vimdiff.args = -d $base $local $output $other +close +close +vimdiff.check = changed, conflicts + + %include ~/.hgrc.local
