diff options
author | Junio C Hamano <gitster@pobox.com> | 2009-09-01 09:08:57 +0400 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2009-09-01 09:08:57 +0400 |
commit | d34eca0392ef1da769788b60402d9a57dbc8c1c9 (patch) | |
tree | e28d68e6a75970167cfc6dcf5406f609a84fa3ca /merge-recursive.c | |
parent | f324cb50be3d88c6fb6123c85da749695a749f60 (diff) | |
parent | 3b5ef0e216d20a49dac223eb985c22c56512dbec (diff) |
Merge branch 'tf/diff-whitespace-incomplete-line'
* tf/diff-whitespace-incomplete-line:
xutils: Fix xdl_recmatch() on incomplete lines
xutils: Fix hashing an incomplete line with whitespaces at the end
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions