mergetools / gvimdiff2on commit cherry-pick, revert: add the --gpg-sign option (3253553)
   1. "$MERGE_TOOLS_DIR/vimdiff"