diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-16 01:41:29 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-16 01:41:29 +0100 |
| commit | 002a9ec005cd3d4273e3c6b7dbe7a2fb9e70c1bc (patch) | |
| tree | 4cc388911d3a2e414ea48e6b52e489efa792c9ac /builtin-read-tree.c | |
| parent | Merge branch 'rs/pretty-wrap' (diff) | |
| parent | diff --color-words: bit of clean-up (diff) | |
| download | git-002a9ec005cd3d4273e3c6b7dbe7a2fb9e70c1bc.tar.xz git-002a9ec005cd3d4273e3c6b7dbe7a2fb9e70c1bc.zip | |
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 'builtin-read-tree.c')
0 files changed, 0 insertions, 0 deletions