mirror of
https://github.com/deajan/obackup.git
synced 2024-11-14 19:53:42 +01:00
Updated merge syntax
This commit is contained in:
parent
bd06dfe397
commit
02fcf746ef
@ -297,7 +297,7 @@ function setUp () {
|
||||
|
||||
function test_Merge () {
|
||||
cd "$DEV_DIR"
|
||||
./merge.sh
|
||||
./merge.sh obackup
|
||||
assertEquals "Merging code" "0" $?
|
||||
|
||||
cd "$OBACKUP_DIR"
|
||||
|
Loading…
Reference in New Issue
Block a user