Merge branch 'jc/maint-1.6.3-graft-trailing-space' into maint
commitdd2195eb80ee5753e41d9688ddf6758a142a14df
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Nov 2009 00:38:47 +0000 (15 16:38 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Nov 2009 00:38:47 +0000 (15 16:38 -0800)
treeb0417d1e3110a601b958dcbedd2e9a8eb33fe5b2
parent69abb194eed5b2f06590d0145e4034300c3e7ac9
parentfe0a3cb23c7930be419937825591388465ceb47f
Merge branch 'jc/maint-1.6.3-graft-trailing-space' into maint

* jc/maint-1.6.3-graft-trailing-space:
  info/grafts: allow trailing whitespaces at the end of line
commit.c