diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-11-16 00:01:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-16 00:01:56 -0800 |
| commit | d404a3e1a5588fa075e4fae6679603a5add2e4df (patch) | |
| tree | 499295d3bfe889ac42d11a0cd7e7a26fb9d40225 /mailmap.c | |
| parent | Merge branch 'tz/maint-rpm' into maint (diff) | |
| parent | diff --color-words: bit of clean-up (diff) | |
| download | tgif-d404a3e1a5588fa075e4fae6679603a5add2e4df.tar.xz | |
Merge branch 'js/maint-diff-color-words' into maint
* 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 'mailmap.c')
0 files changed, 0 insertions, 0 deletions