diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-15 16:41:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-15 16:41:29 -0800 |
| commit | 002a9ec005cd3d4273e3c6b7dbe7a2fb9e70c1bc (patch) | |
| tree | 4cc388911d3a2e414ea48e6b52e489efa792c9ac /templates | |
| parent | 934c042c9cf09a14762b3fa094f1ba15ec721161 (diff) | |
| parent | 76fd28283f7eeea246a06994edd43ab60e59d853 (diff) | |
| download | git-002a9ec005cd3d4273e3c6b7dbe7a2fb9e70c1bc.tar.gz | |
Merge branch 'js/maint-diff-color-words'
* js/maint-diff-color-words:
diff --color-words: bit of clean-up
diff --color-words -U0: fix the location of hunk headers
t4034-diff-words: add a test for word diff without context
Conflicts:
diff.c
Diffstat (limited to 'templates')
0 files changed, 0 insertions, 0 deletions