Merge branch 'ab/diff-write-incomplete-line' into maint-1.7.11
commitd9b983fc268bd749c947bcf88b977dc24782353b
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 18:08:30 +0000 (11 11:08 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Sep 2012 18:08:30 +0000 (11 11:08 -0700)
treeed226b9150f4e365749352cb092858e5d86061c0
parentffb13460cd15c0b90b7adacfbe4448d4d5387f5e
parent35e2d03c2c24462717d774cd9f4eea46f1474ba1
Merge branch 'ab/diff-write-incomplete-line' into maint-1.7.11

* ab/diff-write-incomplete-line:
  Fix '\ No newline...' annotation in rewrite diffs
diff.c