[PATCH] Rename the 'fredrik' merge strategy to 'recursive'.