Code

Merge branch 'cb/leading-path-removal' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Nov 2010 18:39:08 +0000 (11:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Nov 2010 18:39:08 +0000 (11:39 -0700)
* cb/leading-path-removal:
  do not overwrite files in leading path
  lstat_cache: optionally return match_len
  add function check_ok_to_remove()
  t7607: add leading-path tests
  t7607: use test-lib functions and check MERGE_HEAD

1  2 
cache.h

diff --cc cache.h
Simple merge