summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xcatlfish-dev/merge.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/catlfish-dev/merge.sh b/catlfish-dev/merge.sh
index a571b63..26e6c72 100755
--- a/catlfish-dev/merge.sh
+++ b/catlfish-dev/merge.sh
@@ -23,8 +23,8 @@ sleep $S1
while true; do
echo "$0: merging"
date
- /usr/local/src/catlfish/tools/merge \
- --config /usr/local/etc/catlfish/${LOGNAME}.cfg \
+ /usr/local/catlfish/src/tools/merge \
+ --config ${LOGNAME}.cfg \
--localconfig /usr/local/etc/catlfish/${NODENAME}.cfg \
${MERGE_EXTRA_ARGS}
date