diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-02 07:48:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-02 07:48:09 -0700 |
| commit | 3489428367e0d9d95cf90a8a7f537db958f9a78a (patch) | |
| tree | de2344f45f03a01a3e89f20ebdd1e31dcb12eb30 /xdiff/xmerge.c | |
| parent | b91ffd37d5c18046f7b0bf47e939273bead9e52e (diff) | |
| parent | 1f5b9cc40e80a8a7902236a26844be138887b1d9 (diff) | |
| download | git-3489428367e0d9d95cf90a8a7f537db958f9a78a.tar.gz git-3489428367e0d9d95cf90a8a7f537db958f9a78a.tar.xz | |
Merge branch 'rs/maint-grep-word-regexp-fix' into maint
* rs/maint-grep-word-regexp-fix:
grep: fix colouring of matches with zero length
grep: fix word-regexp at the beginning of lines
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions