rebase-merge.sh: exclude dry-cursor from merge because of conflicts