| commit | 92bb978541af02ac624d1b9aeec296691cc15734 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sun, 21 Sep 2008 01:36:22 +0000 (20 18:36 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sun, 21 Sep 2008 01:37:47 +0000 (20 18:37 -0700) | ||
| tree | b303d263bdf8406f3d2ccc39c7ca5045c114dd07 | treesnapshot (tar.gz zip) |
| parent | 3d8dccd74aa29a9019c4e8b52e75a40189e6f5cb | commitdiff |
| parent | 96d1a8e9d44fd635fad8466dbe0aab6d73495c9f | commitdiff |
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
* bc/maint-diff-hunk-header-fix:
diff hunk pattern: fix misconverted "\{" tex macro introducers
Conflicts:
diff.c
| diff.c | diff1 | diff2 | blobhistory |