Code

Merge branch 'pc/remove-warn' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Jun 2010 15:30:38 +0000 (08:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Jun 2010 15:30:38 +0000 (08:30 -0700)
* 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

1  2 
builtin/apply.c
git-compat-util.h
merge-recursive.c
unpack-trees.c
wrapper.c

diff --cc builtin/apply.c
Simple merge
Simple merge
Simple merge
diff --cc unpack-trees.c
Simple merge
diff --cc wrapper.c
Simple merge