Documentation: typofix --column description

[thirdparty/git.git] / diff.c

diff --git a/diff.c b/diff.c
index 643f4f3f6d02583ba74b81a5454ec89a79784161..2253ec880298b4f146cb20f6dbae365d77b8fdfe 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -4634,7 +4634,8 @@ void diff_setup_done(struct diff_options *options)
         * inside contents.
         */
 
-       if ((options->xdl_opts & XDF_WHITESPACE_FLAGS))
+       if ((options->xdl_opts & XDF_WHITESPACE_FLAGS) ||
+           options->ignore_regex_nr)
                options->flags.diff_from_contents = 1;
        else
                options->flags.diff_from_contents = 0;