diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2017-07-26 12:56:19 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-07-26 12:56:19 -0700 |
| commit | 487fe1ffcd3b3a38477b7e564f235bb7d1b89ecc (patch) | |
| tree | 84704f656f5b21785f3879e11cf6030495d2192e /t/t3309-notes-merge-auto-resolve.sh | |
| parent | Git 2.14-rc1 (diff) | |
| parent | convert: add "status=delayed" to filter process protocol (diff) | |
| download | tgif-487fe1ffcd3b3a38477b7e564f235bb7d1b89ecc.tar.xz | |
Merge branch 'ls/filter-process-delayed' into jt/subprocess-handshake
* ls/filter-process-delayed:
convert: add "status=delayed" to filter process protocol
convert: refactor capabilities negotiation
convert: move multiple file filter error handling to separate function
convert: put the flags field before the flag itself for consistent style
t0021: write "OUT <size>" only on success
t0021: make debug log file name configurable
t0021: keep filter log files on comparison
Diffstat (limited to 't/t3309-notes-merge-auto-resolve.sh')
0 files changed, 0 insertions, 0 deletions