config

2022-11-09 23:20:55 +00:00
parent f96692fba0
commit b4e5d6a60a
11 changed files with 90 additions and 50 deletions
--- a/google/.hgrc
+++ b/google/.hgrc
@ -25,7 +25,7 @@ summarize.extra_args = --proxy
 [merge-tools]
 # meld.args = --auto-merge --label='incoming' $local --label='merged' $base --label='existing' $other -o $output
 # https://www.mercurial-scm.org/wiki/MergingWithVim#More_Useful_3-Way_Diff
-vimdiff.executable = vimdiff
+vimdiff.executable = nvim
 vimdiff.args = -f -d $output -M $local $base $other -c "wincmd J" -c "set modifiable" -c "set write"
 vimdiff.premerge = keep