diff options
| author | Linus Nordberg <linus@nordu.net> | 2017-09-06 18:49:00 +0200 |
|---|---|---|
| committer | Linus Nordberg <linus@nordu.net> | 2017-09-06 18:49:00 +0200 |
| commit | 103af6e183fbec63cc7d21a24d21a073d7c9e0f1 (patch) | |
| tree | ebb3d6dfea82ee5c651c5d1af309e6d0f0cc5129 | |
| parent | a07600705390f7742b44a7483edcbbab89197b00 (diff) | |
Find merge in new tools/ dir.
| -rwxr-xr-x | catlfish-dev/merge.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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} |