Merge branch 'nd/maint-ignore-exclude' into nd/ignore-might-be-precious
* nd/maint-ignore-exclude: checkout,merge: loosen overwriting untracked file check based on info/exclude
Junio C Hamano committed
Nov 28, 2011 at 10:41 UTC
f44054c82f4199ccff14f472e4fd7904b0db8ff5
No changes.