diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-06-24 14:28:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-06-24 14:28:36 -0700 |
| commit | 2f4af84578ab3302ba188a86e75743cafc23d300 (patch) | |
| tree | 05633bd8faa5961f61a76f1dcd6ccb53866079f4 /t/t7600-merge.sh | |
| parent | Merge branch 'da/mergetools-meld-output-opt-on-macos' (diff) | |
| parent | grep: fix erroneously copy/pasted variable in check/assert pattern (diff) | |
| download | tgif-2f4af84578ab3302ba188a86e75743cafc23d300.tar.xz | |
Merge branch 'ab/pcre-v2'
Hotfix for a topic already in 'master'.
* ab/pcre-v2:
grep: fix erroneously copy/pasted variable in check/assert pattern
Diffstat (limited to 't/t7600-merge.sh')
0 files changed, 0 insertions, 0 deletions