diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-11-21 22:30:45 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-21 22:30:45 (GMT) |
| commit | e14d63198867c545d0662afc00bf7be048bf2231 (patch) | |
| tree | 1557e5d0430cfc807c0f23df891b6cbbf7070ff7 /t/t3507-cherry-pick-conflict.sh | |
| parent | 0f64a5a3a25c9a161c4e70ae031c885a6284ddb8 (diff) | |
| parent | 1e501a7c47ad5ada53d3b1acfb9f131f76e969ec (diff) | |
| download | git-e14d63198867c545d0662afc00bf7be048bf2231.zip git-e14d63198867c545d0662afc00bf7be048bf2231.tar.gz git-e14d63198867c545d0662afc00bf7be048bf2231.tar.bz2 | |
Merge branch 'maint'
* maint:
documentation fix: git difftool uses diff tools, not merge tools.
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions