diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-04-17 23:40:45 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-04-17 23:40:45 +0400 |
commit | f3bd6ab7ea7b35ca5f26f106eb00a00f257716d7 (patch) | |
tree | 91956e5a6a412502376f1d54009c9d23e213074a /gitk-git/po/ja.po | |
parent | f02dd06e26ed9f6f6f265791cfc7bfb48babf3b5 (diff) | |
parent | 53b3c47d64b4294ae586d1daa04f9140dadd9ae6 (diff) |
Merge branch 'maint'
* maint:
t1010-mktree: Adjust expected result to code and documentation
combined diff: correctly handle truncated file
Document new "already-merged" rule for branch -d
Diffstat (limited to 'gitk-git/po/ja.po')
0 files changed, 0 insertions, 0 deletions