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 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; |