Merge branch 'pc/remove-warn' into maint
commit21919d396a3a05ccb8d6b538b246500f01585bb7
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Jun 2010 15:30:38 +0000 (22 08:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Jun 2010 15:30:38 +0000 (22 08:30 -0700)
tree0b7d4710abcdb0b637557808064cd40bc3b72da6
parente0ae1e6f4d53c68bd219385f6f309c033d0fc673
parent25755e842f814751fbdb7abfc8255a40f24bfaa3
Merge branch 'pc/remove-warn' into maint

* 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
unpack-trees.c
wrapper.c