Merge branch 'mc/ws'
commita3342a2f52a5351739577f8773eab2a1db20b651
authorJunio C Hamano <junkio@cox.net>
Tue, 22 May 2007 06:57:05 +0000 (21 23:57 -0700)
committerJunio C Hamano <junkio@cox.net>
Tue, 22 May 2007 06:57:05 +0000 (21 23:57 -0700)
tree92dbd4a48490ff261729edfbe0f92f9f99fefac7
parent23615708e2abef5c293ddee9335950161a038133
parent077e1af5983000266bc7c1423a87b7768ca03754
Merge branch 'mc/ws'

* mc/ws:
  git-apply: Fix removal of new trailing blank lines.
  Teach 'git-apply --whitespace=strip' to remove empty lines at the end of file