diff options
author | Junio C Hamano <gitster@pobox.com> | 2017-05-05 13:21:52 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2017-05-05 13:21:52 +0900 |
commit | fc92b0878ccaa128e7c4505788f7c477284f0021 (patch) | |
tree | 3bdbf4c34ebd3cadfd54c3cfff66cc95e13b5571 /Documentation/git-mergetool.txt | |
parent | preparing for 2.10.3 (diff) | |
parent | Git 2.9.4 (diff) | |
download | tgif-fc92b0878ccaa128e7c4505788f7c477284f0021.tar.xz |
Merge branch 'maint-2.9' into maint-2.10
Diffstat (limited to 'Documentation/git-mergetool.txt')
0 files changed, 0 insertions, 0 deletions