From: Elijah Newren Date: Fri, 13 Aug 2010 02:09:11 GMT Subject: [PATCH 1/2] merge-recursive: Workaround unused variable warning Message-ID: <1281665352-10533-2-git-send-email-newren@gmail.com> In-Reply-To: <1281665352-10533-1-git-send-email-newren@gmail.com> Signed-off-by: Elijah Newren --- merge-recursive.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/merge-recursive.c b/merge-recursive.c index 9678c1d..7e32498 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1214,6 +1214,7 @@ static int process_df_entry(struct merge_options *o, /* We currently only handle D->F cases */ assert((!o_sha && a_sha && !b_sha) || (!o_sha && !a_sha && b_sha)); + (void)o_sha; entry->processed = 1; -- 1.7.2.1.119.gca9fe.dirty