Fix combined use of whitespace ignore options to diff