diff options
Diffstat (limited to 'src/merge.c')
| -rw-r--r-- | src/merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/merge.c b/src/merge.c index 0db34d0..9f761d4 100644 --- a/src/merge.c +++ b/src/merge.c @@ -541,7 +541,7 @@ context_matches_file (lin old, lin where) line = ifetch (where, false, &size); return size && - (canonicalize ? + (canonicalize_ws ? similar (pfetch (old), pch_line_len (old), line, size) : (size == pch_line_len (old) && memcmp (line, pfetch (old), size) == 0)); |