diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-02-28 16:31:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-28 16:31:02 -0800 |
| commit | f474c526618d5d1111b585a6344e012fb731d3fe (patch) | |
| tree | 6d73ae897c7d9eee9603ee1dfb88cc30e7444142 /git-mergetool.sh | |
| parent | Merge branch 'maint' (diff) | |
| parent | Fix odb_mkstemp() on AIX (diff) | |
| download | tgif-f474c526618d5d1111b585a6344e012fb731d3fe.tar.xz | |
Merge branch 'jc/maint-1.6.0-pack-directory'
* jc/maint-1.6.0-pack-directory:
Fix odb_mkstemp() on AIX
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions