Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7
commit3b425656a469722d9c45b7c88e0e01a9cd8c0fd3
authorJunio C Hamano <gitster@pobox.com>
Wed, 14 Dec 2011 05:47:08 +0000 (13 21:47 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 14 Dec 2011 05:47:08 +0000 (13 21:47 -0800)
tree189b98866ea410ba2a94a578b4c7261b4f52e434
parent7857e3246fef2fdfa3c0fc645cd3d72ff3e6572b
parentfc001b526c42e5fb776340136a2fb247e391a61b
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
builtin/checkout.c
builtin/merge.c