summaryrefslogtreecommitdiff
path: root/builtin/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2010-12-03 16:13:06 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-12-03 16:13:06 -0800
commit39f04dbaacbb21864547c8cf087697469666d21e (patch)
tree260c02b84f44d35e91284e4771ff238c26805830 /builtin/merge-recursive.c
parentMerge branch 'pn/commit-autosquash' (diff)
parentRemove pack file handling dependency from wrapper.o (diff)
downloadtgif-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 'builtin/merge-recursive.c')
0 files changed, 0 insertions, 0 deletions