Merge branch 'jp/symlink-dirs' into next
commit090e65fdbc8d53104b9330d228e615ae34b04cf4
authorJunio C Hamano <gitster@pobox.com>
Sun, 9 Aug 2009 20:36:40 +0000 (9 13:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 9 Aug 2009 20:36:40 +0000 (9 13:36 -0700)
tree0e07c96977a720c48e5644b4227efa3123ee6809
parent2459c20ed5583aaaa6afcef53823a416fc150b73
parentb6b0737d02e3bb9b3015ec66f5b6454d5b83d57b
Merge branch 'jp/symlink-dirs' into next

* jp/symlink-dirs:
  t6035-merge-dir-to-symlink depends on SYMLINKS prerequisite