Merge branch 'pc/remove-warn' into next
commit52fc00dc5c18c0e33e422bbce55153f10d5e925e
authorJunio C Hamano <gitster@pobox.com>
Sat, 3 Apr 2010 04:39:17 +0000 (2 21:39 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sat, 3 Apr 2010 04:39:17 +0000 (2 21:39 -0700)
tree68a6ad7f2a54bc86fb7cd8a28996f17b2b74c2e9
parentc991acf94e8a95d660d586f31a320d21343c7092
parent25755e842f814751fbdb7abfc8255a40f24bfaa3
Merge branch 'pc/remove-warn' into next

* pc/remove-warn:
  Remove a redundant errno test in a usage of remove_path
  Introduce remove_or_warn function
  Implement the rmdir_or_warn function
  Generalise the unlink_or_warn function
git-compat-util.h
merge-recursive.c