Merge branch 'nd/maint-setup'
commitc67e367c50304c5a0701ae2bb8ecb7291f481ffd
authorJunio C Hamano <gitster@pobox.com>
Mon, 2 May 2011 22:58:30 +0000 (2 15:58 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 2 May 2011 22:58:30 +0000 (2 15:58 -0700)
tree6c4015ddf403faec0ed182c39341cb42e670f878
parent2db8926236406a4e4cb17d1b9c4b791706fb0512
parentb892913d51795ee66d825bedd23e5c4ffe85ebb2
Merge branch 'nd/maint-setup'

* nd/maint-setup:
  Kill off get_relative_cwd()
  setup: return correct prefix if worktree is '/'

Conflicts:
dir.c
setup.c
dir.c
dir.h
setup.c