diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-03-28 14:34:55 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-03-28 14:34:55 -0700 |
commit | d8355e5eaecddbcafdd66aa3d6433ae12f627177 (patch) | |
tree | 1a788d01a91203b999b9c751a6ab1ad0ee8b143a /git-difftool.perl | |
parent | 8617715cc09b7422fe31189f9476f6ade73ede70 (diff) | |
parent | 5e950c2199448d44388f7ca25c837fe7650da93c (diff) | |
download | git-d8355e5eaecddbcafdd66aa3d6433ae12f627177.tar.gz |
Merge branch 'maint'
* maint:
git help config: s/insn/instruction/
Diffstat (limited to 'git-difftool.perl')
0 files changed, 0 insertions, 0 deletions