Merge branch 'mm/include-userpath' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 10 May 2012 17:33:05 +0000 (10:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 10 May 2012 17:33:05 +0000 (10:33 -0700)
By Jeff King
* mm/include-userpath:
  config: expand tildes in include.path variable

1  2 
config.c

diff --cc config.c
Simple merge