tree b4168c0348e392680bcb3036dd7bd66743631437
parent eb12adc74cf22add318f884072be2071d181abaa
author David Aguilar <davvid@gmail.com> 1554363279 -0700
committer Junio C Hamano <gitster@pobox.com> 1554369686 +0900

contrib/completion: add smerge to the mergetool completion candidates

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>