diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-26 04:01:50 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-26 04:01:50 +0200 |
| commit | 2c5942dbae01e5c23d2b68aced019702eb256ad9 (patch) | |
| tree | 38b103a22d51dc22835a06d375bab806c513acdb /builtin-merge-ours.c | |
| parent | Merge branch 'jk/maint-add-empty' into maint (diff) | |
| parent | print unlink(2) errno in copy_or_link_directory (diff) | |
| download | git-2c5942dbae01e5c23d2b68aced019702eb256ad9.tar.xz git-2c5942dbae01e5c23d2b68aced019702eb256ad9.zip | |
Merge branch 'ar/unlink-err' into maint
* ar/unlink-err:
print unlink(2) errno in copy_or_link_directory
replace direct calls to unlink(2) with unlink_or_warn
Introduce an unlink(2) wrapper which gives warning if unlink failed
Diffstat (limited to 'builtin-merge-ours.c')
0 files changed, 0 insertions, 0 deletions