From: Kevin Bracey <kevin@bracey.fi>
Date: Sun, 24 Mar 2013 12:26:23 +0000 (+0200)
Subject: git-merge-one-file: style cleanup
X-Git-Tag: v1.8.3-rc0~168^2~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/333ea38db95c77fad8b18daa80bbf0f96fee556c?hp=333ea38db95c77fad8b18daa80bbf0f96fee556c

git-merge-one-file: style cleanup

Update style to match Documentation/CodingGuidelines.

Signed-off-by: Kevin Bracey <kevin@bracey.fi>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---