evolve: add a test in pubdiv where only merging leads to conflict Added a test in public divergence where both the cset are on the different parent and no conflict in relocation but in merging.

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