| commit | cd0843198fecf9faa6e82f6db15fc9c7ec31d3f4 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 20 Sep 2008 06:51:01 +0000 (19 23:51 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 20 Sep 2008 06:51:01 +0000 (19 23:51 -0700) | ||
| tree | a249a3382129dfa4aa572af0e7ce1fe44c5bac9c | treesnapshot (tar.gz zip) |
| parent | dde4af4313c6fba5269df384d97ef4fa3ab5971d | commitdiff |
| parent | 6a6baf9b4e819a0bbfd70627f966cd7144dd8301 | commitdiff |
Merge branch 'bc/maint-diff-hunk-header-fix' into bc/master-diff-hunk-header-fix
* bc/maint-diff-hunk-header-fix:
diff: use extended regexp to find hunk headers
Conflicts:
diff.c
* bc/maint-diff-hunk-header-fix:
diff: use extended regexp to find hunk headers
Conflicts:
diff.c
| diff.c | diff1 | diff2 | blobhistory |