Merge branch 'kb/maint-diff-ws-check' into maint

* kb/maint-diff-ws-check: diff: handle lines containing only whitespace and tabs better test-lib: extend test_decode_color to handle more color codes