Merge branch 'nd/maint-ignore-exclude' into nd/ignore-might-be-precious
authorJunio C Hamano <gitster@pobox.com>
Mon, 28 Nov 2011 18:41:43 +0000 (10:41 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 28 Nov 2011 18:41:43 +0000 (10:41 -0800)
* nd/maint-ignore-exclude:
checkout,merge: loosen overwriting untracked file check based on info/exclude

No differences found