Mercurial > index.cgi > dotfiles

changeset 187:1e15f715858e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
A slightly nicer vimdiff
author Steve Huston <huston@astro.princeton.edu>
date Thu, 05 Mar 2020 18:01:08 -0500
parents 83f164405755
children a05016e4881b
files .hgrc
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgrc	Tue Mar 03 16:48:59 2020 -0500
+++ b/.hgrc	Thu Mar 05 18:01:08 2020 -0500
@@ -13,7 +13,8 @@
 
 [merge-tools]
 vimdiff.executable = vim
-vimdiff.args = -d $output $base $local $other -c "wincmd J"
+vimdiff.args = -f -d $output -M $local $base $other -c "wincmd J" -c "set modifiable" -c "set write"
+vimdiff.premerge = keep
 
 [trusted]
 groups = help