diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-11-17 15:01:47 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-17 15:01:47 -0800 |
| commit | 44e4155f8356a33e04a23b37a111bb4af0a8b060 (patch) | |
| tree | 73afd89c86acefa95587e3f1cd6e0ad40d0b284e /contrib/examples/git-merge.sh | |
| parent | Merge branch 'bg/maint-gitweb-test-lib' (diff) | |
| parent | diff: handle lines containing only whitespace and tabs better (diff) | |
| download | tgif-44e4155f8356a33e04a23b37a111bb4af0a8b060.tar.xz | |
Merge branch 'kb/maint-diff-ws-check'
* 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
Diffstat (limited to 'contrib/examples/git-merge.sh')
0 files changed, 0 insertions, 0 deletions