summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-09-07 10:23:51 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-09-07 10:24:25 -0700
commit02748bc7bb327f80c1942e2191801f8e8e337510 (patch)
tree078be54462768ead9475166ecfa37ba0ae4d7bcf /builtin/merge.c
parentGit 2.10 (diff)
parentgit-gui: update Japanese information (diff)
downloadtgif-02748bc7bb327f80c1942e2191801f8e8e337510.tar.xz
Merge branch 'sy/i18n' of git-gui
* 'sy/i18n' of git-gui: git-gui: update Japanese information git-gui: update Japanese translation git-gui: add Japanese language code git-gui: apply po template to Japanese translation git-gui: consistently use the same word for "blame" in Japanese git-gui: consistently use the same word for "remote" in Japanese
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions