Linux/obackup
1
0
Fork 0
mirror of https://github.com/deajan/obackup.git synced 2025-05-10 20:23:41 +02:00
Code Issues Releases Wiki Activity

Updated merge syntax

Browse Source
This commit is contained in:
deajan 2017-06-20 15:22:57 +02:00
parent bd06dfe397
commit 02fcf746ef
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

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