Merge branch 'nd/maint-ignore-exclude'

* nd/maint-ignore-exclude: checkout,merge: loosen overwriting untracked file check based on info/exclude

Junio C Hamano committed Dec 5, 2011 at 15:25 UTC 9ef569791f967c1559b498d8f77a2c42a14be2ed

No changes.