summaryrefslogtreecommitdiff
path: root/builtin/merge.c
diff options
context:
space:
mode:
authorLibravatar Satoshi Yasushima <s.yasushima@gmail.com>2016-09-07 01:02:21 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-09-07 10:21:36 -0700
commit52285c8312d157a1c2ad562700ffb527b917483f (patch)
treebed1cdc6abd0d17b0db8710195945c12f7f294a2 /builtin/merge.c
parentgit-gui: update Japanese translation (diff)
downloadtgif-52285c8312d157a1c2ad562700ffb527b917483f.tar.xz
git-gui: update Japanese information
Signed-off-by: Satoshi Yasushima <s.yasushima@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge.c')
0 files changed, 0 insertions, 0 deletions