Merge branch 'js/maint-no-ln-across-libexec-and-bin'
commit2c8f8b19d4f293edd78885880ed1a6166395ffdd
authorJunio C Hamano <gitster@pobox.com>
Sat, 23 May 2009 08:43:08 +0000 (23 01:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 23 May 2009 08:43:08 +0000 (23 01:43 -0700)
treec61979dbec0499dfa8e1f9936e2a5001d6fac8f1
parentbbc0995792880d9f87f5c1a871f5f55b7284c7f1
parent3426e34feddf97085615e619d39f8173ff3f9fb4
Merge branch 'js/maint-no-ln-across-libexec-and-bin'

* js/maint-no-ln-across-libexec-and-bin:
  Add NO_CROSS_DIRECTORY_HARDLINKS support to the Makefile

Conflicts:
Makefile
Makefile