From c6d03c958fc5604c8a00c9a512ec342caa3e43ef Mon Sep 17 00:00:00 2001 From: "Scott J. Goldman" Date: Wed, 28 Nov 2012 18:07:08 -0800 Subject: [PATCH] fix coding style: while( -> while ( --- src/merge.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/merge.c b/src/merge.c index e0fc0abf1..96d2168ba 100644 --- a/src/merge.c +++ b/src/merge.c @@ -258,7 +258,7 @@ static int count_ahead_behind(git_commit_list_node *one, git_commit_list_node *t if (git_pqueue_insert(&pq, two) < 0) return -1; - while((commit = git_pqueue_pop(&pq)) != NULL) { + while ((commit = git_pqueue_pop(&pq)) != NULL) { if (commit->flags & RESULT || (commit->flags & (PARENT1 | PARENT2)) == (PARENT1 | PARENT2)) continue;