Andrew's git / gitweb.git / diff
?
Merge branch 'tr/maint-word-diff-incomplete-line'
authorJunio C Hamano <gitster@pobox.com>
Wed, 18 Jan 2012 23:16:19 +0000 (15:16 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 18 Jan 2012 23:16:19 +0000 (15:16 -0800)
* tr/maint-word-diff-incomplete-line:
word-diff: ignore '\ No newline at eof' marker

1  2 
diff.c patch | diff1 | diff2 | blob | history
t/t4034-diff-words.sh patch | diff1 | diff2 | blob | history
diff --cc diff.c
Simple merge
diff --cc t/t4034-diff-words.sh
Simple merge