# HG changeset patch
# User Steve Huston <huston@astro.princeton.edu>
# Date 1583449268 18000
# Node ID 1e15f715858e065a8039d3848be8f9e11023149e
# Parent  83f16440575579600350a82e41c180a5cfd36318
A slightly nicer vimdiff

diff -r 83f164405755 -r 1e15f715858e .hgrc
--- 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