Mercurial > hg > mhoward > dotfiles / changeset

• changeset
• raw
• gz

changeset

Use a more manageable vimdiff mhoward-lt

Sun, 15 Jun 2014 13:08:14 -0400

author

Meredith Howard <mhoward@roomag.org>

date

Sun, 15 Jun 2014 13:08:14 -0400

branch

mhoward-lt

changeset 62

5cc55bc23c8a

parent 61

403d6acca6bb

child 64

a5ac7a1a2aaa

Use a more manageable vimdiff

--- a/.hgrc
+++ b/.hgrc
@@ -1,5 +1,6 @@
 [ui]
 username = Meredith Howard <mhoward@roomag.org>
+merge = vimdiff
 
 [extensions]
 hgext.graphlog = 
@@ -17,4 +18,9 @@ pager = LESS='FSRX' less
 [alias]
 fetch = pull --rebase
 
+[merge-tools]
+vimdiff.executable = vim
+vimdiff.args = -d $base $local $output $other +close +close
+
+
 %include ~/.hgrc.local