summaryrefslogtreecommitdiff
path: root/rerere.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-03-14 10:46:17 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-03-14 10:46:17 -0700
commitdb6696f653b917509dac1ac13b922e12773a84ff (patch)
treefe5de29030f728b5bebbdc22ff062b42a0f7e557 /rerere.h
parentGit 2.8-rc2 (diff)
parentwt-status: allow "ahead " to be picked up by l10n (diff)
downloadtgif-db6696f653b917509dac1ac13b922e12773a84ff.tar.xz
Merge branch 'mg/wt-status-mismarked-i18n'
* mg/wt-status-mismarked-i18n: wt-status: allow "ahead " to be picked up by l10n
Diffstat (limited to 'rerere.h')
0 files changed, 0 insertions, 0 deletions