From: Stefan Huber <s.huber@bct-electronic.com>
Date: Thu, 15 Nov 2012 10:02:31 +0000 (+0100)
Subject: Merge branch 'master' of ssh://aristoteles.sthu.org:2407/~/gitweb/shutils
X-Git-Url: https://git.sthu.org/?a=commitdiff_plain;h=0fdcd43f716bd3c0c29c189df1a54c88d0ac015c;hp=8bbeeb87da60921bf5e710bd37773102b0d26841;p=shutils.git

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

diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig
index 7ff0347..d31aa9e 100644
--- 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 6a3fa0b..14bad3f 100644
--- 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 bfdb840..bd4b144 100755
--- 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=$?