France and the Indian Ocean state of Comoros have agreed to resolve a row linked to immigration and territorial disputes, they said on Wednesday.