Merge branch 'bk/fix-relative-gitdir-file'
authorJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2010 22:38:34 +0000 (14:38 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 20 Jan 2010 22:38:34 +0000 (14:38 -0800)
* bk/fix-relative-gitdir-file:
  Handle relative paths in submodule .git files
  Test update-index for a gitlink to a .git file

1  2 
setup.c

diff --cc setup.c
Simple merge