Merge branch 'pc/remove-warn'
authorJunio C Hamano <gitster@pobox.com>
Sun, 9 May 2010 05:32:59 +0000 (22:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 9 May 2010 05:32:59 +0000 (22:32 -0700)
commit3ecaa3b6a5f707617ea610d727c696f43f8b2f0b
tree092dc9814e12b70ae637c26e36e5d0e6813657b4
parent43acff34b902c38808ac0f326090f2516250e1f0
parent25755e842f814751fbdb7abfc8255a40f24bfaa3
Merge branch 'pc/remove-warn'

* 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