From: Jeff King <peff@peff.net>
Date: Thu, 15 Dec 2016 17:43:46 +0000 (-0500)
Subject: merge: mark usage error strings for translation
X-Git-Tag: v2.12.0-rc0~105^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c7d227df5bf7fe9d5df98a55cd637bfaf38685ea?hp=c7d227df5bf7fe9d5df98a55cd637bfaf38685ea

merge: mark usage error strings for translation

The nearby error messages are already marked for
translation, but these new ones aren't.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---