diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-03 16:13:06 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-03 16:13:06 -0800 |
| commit | 39f04dbaacbb21864547c8cf087697469666d21e (patch) | |
| tree | 260c02b84f44d35e91284e4771ff238c26805830 /git-mergetool--lib.sh | |
| parent | 9bec60d3a52fa10b276214f8d255d6ff05a04b77 (diff) | |
| parent | e0500293852910c2f44fce61e7eb856adbc20d8a (diff) | |
| download | git-39f04dbaacbb21864547c8cf087697469666d21e.tar.gz git-39f04dbaacbb21864547c8cf087697469666d21e.tar.xz | |
Merge branch 'jn/thinner-wrapper'
* jn/thinner-wrapper:
Remove pack file handling dependency from wrapper.o
pack-objects: mark file-local variable static
wrapper: give zlib wrappers their own translation unit
strbuf: move strbuf_branchname to sha1_name.c
path helpers: move git_mkstemp* to wrapper.c
wrapper: move odb_* to environment.c
wrapper: move xmmap() to sha1_file.c
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions