Code

Merge branch 'nd/maint-ignore-exclude'
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Dec 2011 23:25:12 +0000 (15:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Dec 2011 23:25:12 +0000 (15:25 -0800)
commit9ef569791f967c1559b498d8f77a2c42a14be2ed
treeafd2b29be852150fd4f74d57e257ab47729ca86c
parentce8781e8ab66fb90fb7baf8d953a4582a06571a7
parentfc001b526c42e5fb776340136a2fb247e391a61b
Merge branch 'nd/maint-ignore-exclude'

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