author | Junio C Hamano <gitster@pobox.com> | |
Wed, 18 Jan 2012 23:16:19 +0000 (15:16 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Wed, 18 Jan 2012 23:16:19 +0000 (15:16 -0800) | ||
commit | 05c65cb1161f232c65b186d6d6eb3bce9c6a0924 | |
tree | 6eb5898b90cadc7196cffb9c9ad0ddabe12b914f | tree | snapshot |
parent | b63103e908af54e5e2eaa3faad350e4738ef0047 | commit | diff |
parent | c7c2bc0ac9e7f077771db53960d4917fda4b27a7 | commit | diff |
Merge branch 'tr/maint-word-diff-incomplete-line'
* tr/maint-word-diff-incomplete-line:
word-diff: ignore '\ No newline at eof' marker
* tr/maint-word-diff-incomplete-line:
word-diff: ignore '\ No newline at eof' marker
diff.c | diff1 | | diff2 | | blob | history |
t/t4034-diff-words.sh | diff1 | | diff2 | | blob | history |