Merge branch 'ma/unpack-trees-free-msgs'
authorJunio C Hamano <gitster@pobox.com>
Wed, 30 May 2018 12:51:29 +0000 (21:51 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 30 May 2018 12:51:29 +0000 (21:51 +0900)
Leak plugging.

* ma/unpack-trees-free-msgs:
unpack_trees_options: free messages when done
argv-array: return the pushed string from argv_push*()
merge-recursive: provide pair of `unpack_trees_{start,finish}()`
merge: setup `opts` later in `checkout_fast_forward()`

1  2 
argv-array.c
argv-array.h
builtin/checkout.c
merge-recursive.c
merge.c
unpack-trees.c
diff --cc argv-array.c
Simple merge
diff --cc argv-array.h
Simple merge
Simple merge
Simple merge
diff --cc merge.c
Simple merge
diff --cc unpack-trees.c
Simple merge