WMDE
/
osync
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge now requires program name

This commit is contained in:
deajan 2017-06-19 16:01:47 +02:00
parent 2038a2ecb9
commit 29dc7a3e9e
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/tests/run_tests.sh
View File

@ -285,7 +285,7 @@ function setUp () {
# This test has to be done everytime in order for osync executable to be fresh
function test_Merge () {
cd "$DEV_DIR"
./merge.sh
./merge.sh osync
assertEquals "Merging code" "0" $?
cd "$OSYNC_DIR"