mergetools / gvimdiff2on commit trailer: make args have their own struct (cc71b0d)
   1. "$MERGE_TOOLS_DIR/vimdiff"