]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'mr/mark-i18n-log-rerere'
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 18:38:40 +0000 (11:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2014 18:38:41 +0000 (11:38 -0700)
* mr/mark-i18n-log-rerere:
  builtin/log.c: mark strings for translation
  rerere.h: mark string for translation

1  2 
builtin/log.c

diff --cc builtin/log.c
Simple merge