Make function static

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Fixed issue #2148: Cherry pick with conflicts does not add "Cherry picked from..."

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>