Merge branch 'bs/maint-t7005' into maint
commit18a135f419b803fd6d18c8e3f4b0194f11732d0f
authorJunio C Hamano <gitster@pobox.com>
Sun, 25 Nov 2007 02:01:46 +0000 (24 18:01 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 25 Nov 2007 02:01:46 +0000 (24 18:01 -0800)
tree0a83ca2302ecae68d71728ae033be98383e4daa9
parent89919f4f57006358c278c1f207249edcccbe68c4
parente70f3202512a022898657047b59b46355be1631b
Merge branch 'bs/maint-t7005' into maint

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