projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 042e290) | patch
merge: mark usage error strings for translation
authorJeff King <peff@peff.net>
Thu, 15 Dec 2016 17:43:46 +0000 (12:43 -0500)
committerJunio C Hamano <gitster@pobox.com>
Fri, 16 Dec 2016 00:14:34 +0000 (16:14 -0800)
commitc7d227df5bf7fe9d5df98a55cd637bfaf38685ea
tree3963fa22a71ea0d2e9d90a719e71eb0410e322a4tree | snapshot
parent042e290da6aee0a9f21cd5890ccf231c266e177ecommit | diff
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>
builtin/merge.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.