mergetools / gvimdiffon commit Merge branch 'fr_2.5.0_round1' of git://github.com/jnavila/git (1976f9b)
   1. "$MERGE_TOOLS_DIR/vimdiff"