mirror of
https://https.git.savannah.gnu.org/git/patch.git
synced 2026-01-29 10:54:44 +00:00
Add missing parentheses in merge.c
This commit is contained in:
parent
ccba56be0c
commit
c5f41b5c4c
2
merge.c
2
merge.c
@ -285,7 +285,7 @@ merge_hunk (int hunk, struct outstate *outstate, LINENUM where,
|
||||
|
||||
lines = new - firstnew;
|
||||
if (verbosity == VERBOSE
|
||||
|| (verbosity != SILENT) && ! applies_cleanly)
|
||||
|| ((verbosity != SILENT) && ! applies_cleanly))
|
||||
merge_result (&first_result, hunk, "merged",
|
||||
where, where + lines - 1);
|
||||
last_frozen_line += (old - firstold);
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user