mergetools / gvimdiff2on commit Merge branch 'js/sign-empty-commit-fix' (c510926)
   1. "$MERGE_TOOLS_DIR/vimdiff"