summaryrefslogtreecommitdiff
path: root/notes-merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2014-09-19 11:38:40 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-09-19 11:38:41 -0700
commit49fb13bef188fdba6fc4eb2266f79808168e4ebe (patch)
treeb273c9b3fd8fd80a61c7b24aa4738121878ac004 /notes-merge.c
parentMerge branch 'js/no-test-cmp-for-binaries' (diff)
parentbuiltin/log.c: mark strings for translation (diff)
downloadtgif-49fb13bef188fdba6fc4eb2266f79808168e4ebe.tar.xz
Merge branch 'mr/mark-i18n-log-rerere'
* mr/mark-i18n-log-rerere: builtin/log.c: mark strings for translation rerere.h: mark string for translation
Diffstat (limited to 'notes-merge.c')
0 files changed, 0 insertions, 0 deletions