Merge branch 'pc/remove-warn' into next
commitc79c1e6215073e6bd0b35a9567cf092e366ca068
authorJunio C Hamano <gitster@pobox.com>
Wed, 5 May 2010 00:50:08 +0000 (4 17:50 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 5 May 2010 00:50:08 +0000 (4 17:50 -0700)
tree4a727dc4a7e2a38f2520f87c108a6ede7efaf42d
parent23ae2e88e9464f2adc718f51c4b621accc50f452
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
builtin/apply.c
git-compat-util.h
merge-recursive.c