mkdir mergetest
cd mergetest
mkdir trunk
cd trunk
mkdir subdir
cd subdir
echo "line1 00" > test.txt
echo "" >> test.txt
echo "line2 02" >> test.txt
echo "" >> test.txt
echo "line3 01" >> test.txt
cd ..
cd ..
svn import https://<URL>/mergetest
cd ..
rm -rf mergetest
svn co https://<URL>/mergetest mergetest
cd mergetest

svn up
svn cp https://<URL>/mergetest/trunk https://<URL>/mergetest/branch
svn up

cd trunk/subdir
echo "line1 00" > test.txt
echo "" >> test.txt
echo "line2 02" >> test.txt
echo "" >> test.txt
echo "line3 02" >> test.txt
svn ci
cd ../..

cd branch
svn merge https://<URL>/mergetest/trunk
svn ci
svn propget svn:mergeinfo .
cd ..

cd trunk/subdir
echo "line1 00" > test.txt
echo "" >> test.txt
echo "line2 03" >> test.txt
echo "" >> test.txt
echo "line3 01" >> test.txt
svn ci
cd ../..

cd branch/subdir
svn propget svn:mergeinfo .
svn propget svn:mergeinfo ..
svn merge https://<URL>/mergetest/trunk/subdir
svn propget svn:mergeinfo .
svn propget svn:mergeinfo ..
svn ci
cd ../..