summaryrefslogtreecommitdiff
path: root/mergetools/vimdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-09-03 13:58:03 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-09-03 13:58:03 -0700
commiteb76545715e375c163389bffa0f1a75c5537936c (patch)
tree12da19a1dbd69de6d5645781a64b2f8b99ab9001 /mergetools/vimdiff
parentMerge branch 'maint-1.8.3' into maint (diff)
parentl10n: fr.po: hotfix for commit 6b388fc (diff)
downloadtgif-eb76545715e375c163389bffa0f1a75c5537936c.tar.xz
Merge git://github.com/git-l10n/git-po into maint
* git://github.com/git-l10n/git-po: l10n: fr.po: hotfix for commit 6b388fc
Diffstat (limited to 'mergetools/vimdiff')
0 files changed, 0 insertions, 0 deletions