mergetools / gvimdiff2on commit send-pack.c: mark a file-local function static (16a2743)
   1. "$MERGE_TOOLS_DIR/vimdiff"