diff options
| author | Scott J. Goldman <scottjg@github.com> | 2012-11-28 18:07:08 -0800 |
|---|---|---|
| committer | Scott J. Goldman <scottjg@github.com> | 2012-11-28 18:54:57 -0800 |
| commit | c6d03c958fc5604c8a00c9a512ec342caa3e43ef (patch) | |
| tree | 2f20fb50eb3628aaa2dde987475ca230b9c7bb69 | |
| parent | 0d9e0323a552078a6bec639f2c715b3d9f267922 (diff) | |
| download | libgit2-c6d03c958fc5604c8a00c9a512ec342caa3e43ef.tar.gz | |
fix coding style: while( -> while (
| -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; |