Merge branch 'bs/maint-t7005'
commit9f165805f3bde8cd91653f2db1c35a4548b85625
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Nov 2007 22:25:19 +0000 (14 14:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Nov 2007 22:25:19 +0000 (14 14:25 -0800)
treeb8953145506249a3d2ee64f8b680f9c77b34e5cc
parentc78a24986d4d3faff810e87dbcd0ac99f0eabbce
parente70f3202512a022898657047b59b46355be1631b
Merge branch 'bs/maint-t7005'

* bs/maint-t7005:
  t7005-editor.sh: Don't invoke real vi when it is in GIT_EXEC_PATH
t/t7005-editor.sh