]> git.ipfire.org Git - thirdparty/git.git/commit - merge.c
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 3bdd552) | patch
merge: use argv_array when spawning merge strategy
authorJeff King <peff@peff.net>
Thu, 19 Jun 2014 21:29:31 +0000 (17:29 -0400)
committerJunio C Hamano <gitster@pobox.com>
Thu, 19 Jun 2014 22:20:55 +0000 (15:20 -0700)
commit5c1753b198a96ed6abaf6c09db4623df703005a6
treec94625be0e30e685b48df07960cdcf175f80496btree | snapshot
parent3bdd55228b1b76a2c37143636966f333e3782888commit | diff
merge: use argv_array when spawning merge strategy

This is shorter, and avoids a rather complicated set of
allocation and free steps.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge.c diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.