merge-recursive: options to ignore whitespace changes