Merge branch 'jx/i18n-more-marking' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 16 Feb 2012 21:59:53 +0000 (13:59 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 16 Feb 2012 21:59:53 +0000 (13:59 -0800)
* jx/i18n-more-marking:
  i18n: format_tracking_info "Your branch is behind" message
  i18n: git-commit whence_s "merge/cherry-pick" message

1  2 
builtin/commit.c

Simple merge