Code

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)
* 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

diff --cc builtin/apply.c
Simple merge
Simple merge
Simple merge