diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-03-13 22:56:17 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-03-13 22:56:17 +0000 |
| commit | 8b44e05abf256c5c43116b983719cafca2934952 (patch) | |
| tree | 79d894b78d49a2d1be1123ad62b27d0720444f91 /git-gui/lib/encoding.tcl | |
| parent | f62106d750d6442ec2dda92908d4625c4ce90b99 (diff) | |
| parent | 624a93507ed3af41506bb4878c43ed3d33be287e (diff) | |
Merge branch 'en/merge-ort-align-verbosity-with-recursive'
Align the level of verbose output from the ort backend during inner
merge to that of the recursive backend.
* en/merge-ort-align-verbosity-with-recursive:
merge-ort: exclude messages from inner merges by default
Diffstat (limited to 'git-gui/lib/encoding.tcl')
0 files changed, 0 insertions, 0 deletions
