tests/merge: make test run again
authorMarko Kreen <markokr@gmail.com>
Fri, 23 Dec 2011 09:17:18 +0000 (11:17 +0200)
committerMarko Kreen <markokr@gmail.com>
Fri, 23 Dec 2011 09:17:18 +0000 (11:17 +0200)
commit6f9ce39336603e13f8a898899be935ec2903da0f
tree2f8d0f52ee9b45ceaff9acfb036b1e1190e554b9
parentf0d4117b7a09c76fb604e532c3a7a4e06c2d8ff2
tests/merge: make test run again

Now local_add adds table to combined-root too.
Test did not consider that.
tests/merge/regen.sh