1
0
mirror of https://github.com/deajan/obackup.git synced 2024-12-23 22:13:41 +01:00

Updated merge syntax

This commit is contained in:
deajan 2017-06-20 15:22:57 +02:00
parent bd06dfe397
commit 02fcf746ef

View File

@ -297,7 +297,7 @@ function setUp () {
function test_Merge () {
cd "$DEV_DIR"
./merge.sh
./merge.sh obackup
assertEquals "Merging code" "0" $?
cd "$OBACKUP_DIR"