Merge branch 'ab/diff-write-incomplete-line' into maint-1.7.11
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 18:08:30 +0000 (11:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 18:08:30 +0000 (11:08 -0700)
* ab/diff-write-incomplete-line:
  Fix '\ No newline...' annotation in rewrite diffs

1  2 
diff.c

diff --cc diff.c
Simple merge