Junio C Hamano 208247adb9 Merge branch 'cb/leading-path-removal' ...

* cb/leading-path-removal:
  use persistent memory for rejected paths
  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

Conflicts:
	t/t7607-merge-overwrite.sh

2010-11-29 17:52:36 -08:00

39 KiB

Raw Blame History

View Raw