From c5f41b5c4c5da8925482cf00a02bf4fcde62c242 Mon Sep 17 00:00:00 2001
From: Andreas Gruenbacher <agruen@suse.de>
Date: Fri, 3 Apr 2009 18:59:44 +0200
Subject: [PATCH] Add missing parentheses in merge.c

---
 merge.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/merge.c b/merge.c
index 0328288..325e035 100644
--- a/merge.c
+++ b/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);