Merge branch 'tf/diff-whitespace-incomplete-line' into maint
commit6674d310d179400358d581f9725cbd4a2c32e3bf
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Sep 2009 21:27:08 +0000 (16 14:27 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Sep 2009 21:27:08 +0000 (16 14:27 -0700)
treee800b9c207e17f9b11e321cc1fba5dfe08af4222
parentbd91890c62d85ec16aadd3fb991b3ad7a365adde
parent3b5ef0e216d20a49dac223eb985c22c56512dbec
Merge branch 'tf/diff-whitespace-incomplete-line' into maint

* tf/diff-whitespace-incomplete-line:
  xutils: Fix xdl_recmatch() on incomplete lines
  xutils: Fix hashing an incomplete line with whitespaces at the end