merge: use refresh_and_write_cache
authorThomas Gummerer <t.gummerer@gmail.com>
Wed, 11 Sep 2019 18:20:26 +0000 (19:20 +0100)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Sep 2019 16:58:22 +0000 (09:58 -0700)
commite080b34540296e4671b4d1110ba3c71b5224884a
treefef1853984885b16c1bbbf9e9295d5cfa40db5d2
parent22184497a36a90e541617a51de6671ca5948612c
merge: use refresh_and_write_cache

Use the 'refresh_and_write_cache()' convenience function introduced in
the last commit, instead of refreshing and writing the index manually
in merge.c

Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/merge.c