summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5e749e2)
raw | patch | inline | side by side (parent: 5e749e2)
author | Linus Torvalds <torvalds@ppc970.osdl.org> | |
Mon, 20 Jun 2005 03:15:22 +0000 (20:15 -0700) | ||
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
Mon, 20 Jun 2005 03:15:22 +0000 (20:15 -0700) |
Put explicit parentheses around && in ||-expression.
diff-stages.c | patch | blob | history |
diff --git a/diff-stages.c b/diff-stages.c
index f0998149cf1adba825413e15e4279db4da5f71eb..9d8cc73e67165e685b6938172ca7dc68330ed31b 100644 (file)
--- a/diff-stages.c
+++ b/diff-stages.c
! (0 <= stage1 && stage1 <= 3) ||
sscanf(av[2], "%d", &stage2) != 1 ||
! (0 <= stage2 && stage2 <= 3) ||
- find_copies_harder && detect_rename != DIFF_DETECT_COPY)
+ (find_copies_harder && detect_rename != DIFF_DETECT_COPY))
usage(diff_stages_usage);
av += 3; /* The rest from av[0] are for paths restriction. */