mergetools / gvimdiff3on commit t7509: cleanup description and filename (4625540)
   1. "$MERGE_TOOLS_DIR/vimdiff"