From 103af6e183fbec63cc7d21a24d21a073d7c9e0f1 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@nordu.net>
Date: Wed, 6 Sep 2017 18:49:00 +0200
Subject: Find merge in new tools/ dir.

---
 catlfish-dev/merge.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/catlfish-dev/merge.sh b/catlfish-dev/merge.sh
index 26e6c72..37a6d76 100755
--- a/catlfish-dev/merge.sh
+++ b/catlfish-dev/merge.sh
@@ -23,7 +23,7 @@ sleep $S1
 while true; do
     echo "$0: merging"
     date
-    /usr/local/catlfish/src/tools/merge \
+    /usr/local/catlfish/tools/merge \
         --config ${LOGNAME}.cfg \
         --localconfig /usr/local/etc/catlfish/${NODENAME}.cfg \
         ${MERGE_EXTRA_ARGS}
-- 
cgit v1.1