diff options
| author | Junio C Hamano <junkio@cox.net> | 2007-02-18 18:45:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-18 18:45:52 -0800 |
| commit | f5a92647694f18fb3544060a1a964ac082d072b2 (patch) | |
| tree | 72bb1ee2f6c62554b8718b34273591cd9827cd15 /diff.h | |
| parent | b758120144f8850bb2db2f233e2c828be4ba4958 (diff) | |
| parent | 4bc94d289221e16cccbc72f73b3b5b1de0b822c5 (diff) | |
| download | git-f5a92647694f18fb3544060a1a964ac082d072b2.tar.gz git-f5a92647694f18fb3544060a1a964ac082d072b2.tar.xz | |
Merge branch 'maint'
* maint:
GIT 1.5.0.1
Documentation/i18n.txt: it is i18n.commitencoding not core.commitencoding
Read the config in rev-list
Conflicts:
RelNotes
Diffstat (limited to 'diff.h')
0 files changed, 0 insertions, 0 deletions