tests: add test about handling phase-divergent merges We don't handle phase-divergent merges and we should. Upcoming patches will add the ability to handle them.

#!/bin/sh
sleep 5
echo "new desc" >> $1