summaryrefslogtreecommitdiff
path: root/tests/merge/merge_helpers.c
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@microsoft.com>2013-12-09 10:25:36 -0500
committerEdward Thomson <ethomson@microsoft.com>2013-12-09 11:40:44 -0500
commit5588f0736089ab00e12cb7ea7c8143ec666738e6 (patch)
tree1f877c23d223d4dedabafb4bc6c793efe82f9fdc /tests/merge/merge_helpers.c
parent07c5dc84fd486b380d618319b4852591d355bd81 (diff)
downloadlibgit2-5588f0736089ab00e12cb7ea7c8143ec666738e6.tar.gz
Clean up warnings
Diffstat (limited to 'tests/merge/merge_helpers.c')
-rw-r--r--tests/merge/merge_helpers.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/merge/merge_helpers.c b/tests/merge/merge_helpers.c
index 7ca1e6522..5660179a7 100644
--- a/tests/merge/merge_helpers.c
+++ b/tests/merge/merge_helpers.c
@@ -60,7 +60,6 @@ int merge_commits_from_branches(
git_commit *our_commit, *their_commit;
git_oid our_oid, their_oid;
git_buf branch_buf = GIT_BUF_INIT;
- int error;
git_buf_printf(&branch_buf, "%s%s", GIT_REFS_HEADS_DIR, ours_name);
cl_git_pass(git_reference_name_to_id(&our_oid, repo, branch_buf.ptr));