Merge branch 'js/spawn-via-shell-path-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 20 Apr 2012 22:51:18 +0000 (15:51 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Apr 2012 22:51:18 +0000 (15:51 -0700)
Mops up an unfortunate fallout from bw/spawn-via-shell-path topic.

By Johannes Sixt
* js/spawn-via-shell-path-fix:
  Do not use SHELL_PATH from build system in prepare_shell_cmd on Windows

1  2 
run-command.c

diff --cc run-command.c
Simple merge