From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 7 Feb 2012 20:56:54 +0000 (-0800)
Subject: Merge branch 'jx/i18n-more-marking'
X-Git-Tag: v1.7.10-rc0~117
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6f1ede842351ee6c822b7904a9d55a6720992aa8;p=git.git

Merge branch 'jx/i18n-more-marking'

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

6f1ede842351ee6c822b7904a9d55a6720992aa8