Merge branch 'master' of ssh://aristoteles.sthu.org:2407/~/gitweb/shutils

diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig
index 7ff03478e7261f04acfac7e40bc6f6b72b1a7f45..d31aa9e6ee118f00da5990e5cba7acf9775b7954 100644 (file)
--- a/dotfiles/gitconfig
+++ b/dotfiles/gitconfig
@@ -8,7 +8,10 @@
        editor = vim
        pager = less -FXRS -x4
 [merge]
-       tool = gvimdiff
+       tool = splice
+[mergetool "splice"]
+       cmd = "gvim -f $BASE $LOCAL $REMOTE $MERGED -c 'SpliceInit'"
+       trustExitCode = true
 [alias]
        wdiff = diff --color-words
        wlog = log --color-words

diff --git a/dotfiles/hg/hgrc b/dotfiles/hg/hgrc
index 6a3fa0b117bf09cdc4ef8f32ecdf44a2c7ca32bb..14bad3f20486f5a2478375d72cea854c1c738673 100644 (file)
--- a/dotfiles/hg/hgrc
+++ b/dotfiles/hg/hgrc
@@ -5,8 +5,10 @@ editor = vim
 ssh = ssh -C
 
 [merge-tools]
-gvimdiff.executable = gvim
-gvimdiff.args = -f -d $base $local $output $other -c "wincmd J"
+splice.executable = gvim
+splice.args = -f $base $local $other $output -c 'SpliceInit'
+splice.premerge = keep
+splice.priority = 1
 
 [web]
 cacerts =

diff --git a/nsd/nsd-dynipwatch b/nsd/nsd-dynipwatch
index bfdb8407bad273f34f3cf78b7d3e5038be28a69d..bd4b1449ff78df362c9692967412e308831dfbcd 100755 (executable)
--- a/nsd/nsd-dynipwatch
+++ b/nsd/nsd-dynipwatch
@@ -48,6 +48,7 @@ function setSerialInZonefile # <zonefile> <serial>
 
 function run()
 {
+       touch ${watchfile}
        while true; do
                inotifywait -q -t 30 -e close_write "${watchfile}"  > /dev/null
                ret=$?