mergetools / gvimdiffon commit Merge branch 'master' of git://github.com/git-l10n/git-po (bfcfc7d)
   1. "$MERGE_TOOLS_DIR/vimdiff"