From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 16 Feb 2012 21:59:53 +0000 (-0800)
Subject: Merge branch 'jx/i18n-more-marking' into maint
X-Git-Tag: v1.7.9.2~28
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e6d88ca87cbb3d89d639a3ee769486f44f9a33b8;p=git.git

Merge branch 'jx/i18n-more-marking' into maint

* jx/i18n-more-marking:
  i18n: format_tracking_info "Your branch is behind" message
  i18n: git-commit whence_s "merge/cherry-pick" message
---

e6d88ca87cbb3d89d639a3ee769486f44f9a33b8