diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-11-14 14:25:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-11-14 14:25:19 -0800 |
| commit | 9f165805f3bde8cd91653f2db1c35a4548b85625 (patch) | |
| tree | b8953145506249a3d2ee64f8b680f9c77b34e5cc /t/t5515-fetch-merge-logic.sh | |
| parent | c78a24986d4d3faff810e87dbcd0ac99f0eabbce (diff) | |
| parent | e70f3202512a022898657047b59b46355be1631b (diff) | |
| download | git-9f165805f3bde8cd91653f2db1c35a4548b85625.tar.gz | |
Merge branch 'bs/maint-t7005'
* bs/maint-t7005:
t7005-editor.sh: Don't invoke real vi when it is in GIT_EXEC_PATH
Diffstat (limited to 't/t5515-fetch-merge-logic.sh')
0 files changed, 0 insertions, 0 deletions