diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-09-23 15:31:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-09-23 15:31:08 -0700 |
| commit | b7619006ebd9c9760b34bb38e04ce4dc8c606483 (patch) | |
| tree | 3c1640e3f5ec3d1373e290a806554f194f6bd46a /zlib.c | |
| parent | merge-recursive: Do not look at working tree during a virtual ancestor merge (diff) | |
| parent | Git 1.7.6.4 (diff) | |
| download | tgif-b7619006ebd9c9760b34bb38e04ce4dc8c606483.tar.xz | |
Merge 1.7.6.4 in
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'zlib.c')
0 files changed, 0 insertions, 0 deletions