merge-recursive: fix some overly long lines