diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-06-12 20:48:21 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-06-12 20:48:21 -0700 |
| commit | 44bdc434e830cea881eb908e32d80d5bc0c71d4f (patch) | |
| tree | 9636baf35f9087a4f1c2b2efce1056989064f2e9 /merge-index.c | |
| parent | 2cf69cf6edbaa15ed47f9c73c0eb60ce7983ba6b (diff) | |
| parent | e2ac7cb5fbcf1407003aa07cdcd14141527ea2e3 (diff) | |
| download | git-44bdc434e830cea881eb908e32d80d5bc0c71d4f.tar.gz git-44bdc434e830cea881eb908e32d80d5bc0c71d4f.tar.xz | |
Merge branch 'sv/objfixes' into maint
* sv/objfixes:
Don't assume tree entries that are not dirs are blobs
Diffstat (limited to 'merge-index.c')
0 files changed, 0 insertions, 0 deletions