tests/merge: wait for sync on combined-root
authorMarko Kreen <markokr@gmail.com>
Mon, 29 Nov 2010 14:29:14 +0000 (16:29 +0200)
committerMarko Kreen <markokr@gmail.com>
Mon, 29 Nov 2010 14:29:14 +0000 (16:29 +0200)
commitea822b25f67dc14d0678fb8788d68c070b6f5b32
tree48b3eb345199982b293c80e29e3dfdde45483d16
parentc6d7311a487cb3b02d114c81607d747b42e0bfa7
tests/merge: wait for sync on combined-root
tests/merge/regen.sh