diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-02-11 01:41:22 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-11 01:41:22 -0800 |
| commit | afce435000030e3ad076ef1dd413e0fa314cdcbb (patch) | |
| tree | 3d8c1efc4ad599e237dbc41cc25f6f47442bf150 /combine-diff.c | |
| parent | 8a124b82a03240b10c83085559e5988bc92ea7e2 (diff) | |
| parent | 92798702cf6d201f80e257a07d0a0c40565c79fe (diff) | |
| download | git-afce435000030e3ad076ef1dd413e0fa314cdcbb.tar.gz | |
Merge branch 'maint-1.5.5' into maint-1.5.6
* maint-1.5.5:
revision traversal and pack: notice and die on missing commit
Conflicts:
revision.c
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions