diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-02-21 12:45:05 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-02-21 12:45:05 -0800 |
| commit | 66023bbd78fe93c4704b3df754f9f7dc619ebaad (patch) | |
| tree | d40b2026649abff411be794709ace3bec20892e9 /mergetools/ecmerge | |
| parent | Merge branch 'gs/rebase-allow-empty-message' (diff) | |
| parent | t: make 'test_i18ngrep' more informative on failure (diff) | |
| download | tgif-66023bbd78fe93c4704b3df754f9f7dc619ebaad.tar.xz | |
Merge branch 'sg/test-i18ngrep'
Test fixes.
* sg/test-i18ngrep:
t: make 'test_i18ngrep' more informative on failure
t: validate 'test_i18ngrep's parameters
t: move 'test_i18ncmp' and 'test_i18ngrep' to 'test-lib-functions.sh'
t5536: let 'test_i18ngrep' read the file without redirection
t5510: consolidate 'grep' and 'test_i18ngrep' patterns
t4001: don't run 'git status' upstream of a pipe
t6022: don't run 'git merge' upstream of a pipe
t5812: add 'test_i18ngrep's missing filename parameter
t5541: add 'test_i18ngrep's missing filename parameter
Diffstat (limited to 'mergetools/ecmerge')
0 files changed, 0 insertions, 0 deletions