summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Nguyễn Thái Ngọc Duy <pclouds@gmail.com>2012-08-20 19:32:13 +0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-08-20 12:23:17 -0700
commitcf8fe315e6c74e8fafb688c85237cd2583627317 (patch)
treef23aa97620f4e6a4af5cd9a5abe8fb9a75a082b6 /Documentation/git-merge.txt
parenti18n: format-patch: mark parseopt strings for translation (diff)
downloadtgif-cf8fe315e6c74e8fafb688c85237cd2583627317.tar.xz
i18n: fsck: mark parseopt strings for translation
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions