summaryrefslogtreecommitdiff
path: root/rerere.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-04-25 13:36:26 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-04-25 13:36:26 -0700
commit625efa9decb64e2b51c4bef342922553729cf2f6 (patch)
tree471a64f2147f1f420060ff024899b1a9d0c15847 /rerere.h
parentPrepare for 2.8.2 (diff)
parentMerge branch 'fr_v2.8.0_r3' of git://github.com/jnavila/git into maint (diff)
downloadtgif-625efa9decb64e2b51c4bef342922553729cf2f6.tar.xz
Merge tag 'l10n-2.8.0-rnd3-fr' of git://github.com/git-l10n/git-po into maint
l10n-2.8.0-rnd3-fr * tag 'l10n-2.8.0-rnd3-fr' of git://github.com/git-l10n/git-po: l10n: fr: don't translate "merge" as a parameter l10n: fr: change "id de clé" to match "id-clé" l10n: fr: fix wrongly translated option name l10n: fr: fix transcation of "dir"
Diffstat (limited to 'rerere.h')
0 files changed, 0 insertions, 0 deletions