Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7
* nd/maint-ignore-exclude: checkout,merge: loosen overwriting untracked file check based on info/exclude
Junio C Hamano committed
Dec 13, 2011 at 21:47 UTC
3b425656a469722d9c45b7c88e0e01a9cd8c0fd3
No changes.