diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2008-09-20 18:36:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-20 18:37:47 -0700 |
| commit | 92bb978541af02ac624d1b9aeec296691cc15734 (patch) | |
| tree | b303d263bdf8406f3d2ccc39c7ca5045c114dd07 /t/t7600-merge.sh | |
| parent | diff: fix "multiple regexp" semantics to find hunk header comment (diff) | |
| parent | diff hunk pattern: fix misconverted "\{" tex macro introducers (diff) | |
| download | tgif-92bb978541af02ac624d1b9aeec296691cc15734.tar.xz | |
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
Diffstat (limited to 't/t7600-merge.sh')
0 files changed, 0 insertions, 0 deletions