Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix
authorJunio C Hamano <gitster@pobox.com>
Sun, 21 Sep 2008 01:36:22 +0000 (18:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 21 Sep 2008 01:37:47 +0000 (18:37 -0700)
commit92bb978541af02ac624d1b9aeec296691cc15734
treeb303d263bdf8406f3d2ccc39c7ca5045c114dd07
parent3d8dccd74aa29a9019c4e8b52e75a40189e6f5cb
parent96d1a8e9d44fd635fad8466dbe0aab6d73495c9f
Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix

* bc/maint-diff-hunk-header-fix:
  diff hunk pattern: fix misconverted "\{" tex macro introducers

Conflicts:
diff.c
diff.c