diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-03-21 22:53:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-21 22:53:36 -0700 |
| commit | 2990034f1ed2c3d85d23d5611a1f04d317f785ac (patch) | |
| tree | b279df7a87a679a74c942f1c32d42681f9317f4b /builtin-merge.c | |
| parent | Merge branch 'maint-1.6.0' into maint-1.6.1 (diff) | |
| parent | Fix odb_mkstemp() on AIX (diff) | |
| download | tgif-2990034f1ed2c3d85d23d5611a1f04d317f785ac.tar.xz | |
Merge branch 'jc/maint-1.6.0-pack-directory' into maint-1.6.1
* jc/maint-1.6.0-pack-directory:
Fix odb_mkstemp() on AIX
Make sure objects/pack exists before creating a new pack
Conflicts:
wrapper.c
Diffstat (limited to 'builtin-merge.c')
0 files changed, 0 insertions, 0 deletions