diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-03-25 13:45:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-03-25 13:45:26 -0700 |
| commit | a7b6ad5e90be82f4089be39a78850d5f88e4d552 (patch) | |
| tree | 978b2711a5d2b656a7abdd17288fa2f1c2d8a74d /mergetools/p4merge | |
| parent | Merge branch 'wk/doc-pre-rebase' into maint-1.8.1 (diff) | |
| parent | update-index: list supported idx versions and their features (diff) | |
| download | tgif-a7b6ad5e90be82f4089be39a78850d5f88e4d552.tar.xz | |
Merge branch 'nd/doc-index-format' into maint-1.8.1
The v4 index format was not documented.
* nd/doc-index-format:
update-index: list supported idx versions and their features
read-cache.c: use INDEX_FORMAT_{LB,UB} in verify_hdr()
index-format.txt: mention of v4 is missing in some places
Diffstat (limited to 'mergetools/p4merge')
0 files changed, 0 insertions, 0 deletions