merge.c: remove implicit dependency on the_index
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Fri, 21 Sep 2018 15:57:29 +0000 (17:57 +0200)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Sep 2018 16:48:10 +0000 (09:48 -0700)
commit7e196c3...28513225d48bd853846f5618419948c1
treee8be0a9...c2579f94a87a45d71d2525d723fd3812copy hash to clipboard (tree)
parentf4a55b2...977aeaddbfb73041be26701bcd3868a5copy hash to clipboard (diff)
builtin/merge.c
builtin/pull.c
cache.h
merge.c
sequencer.c