diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-11-21 14:30:45 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-11-21 14:30:45 -0800 |
commit | e14d63198867c545d0662afc00bf7be048bf2231 (patch) | |
tree | 1557e5d0430cfc807c0f23df891b6cbbf7070ff7 /t/t5100/rfc2047-info-0002 | |
parent | Merge branch 'rr/misc-fixes' (diff) | |
parent | documentation fix: git difftool uses diff tools, not merge tools. (diff) | |
download | tgif-e14d63198867c545d0662afc00bf7be048bf2231.tar.xz |
Merge branch 'maint'
* maint:
documentation fix: git difftool uses diff tools, not merge tools.
Diffstat (limited to 't/t5100/rfc2047-info-0002')
0 files changed, 0 insertions, 0 deletions