mergetools / gvimdiff2on commit Merge branch 'fr_v2.11.0_rnd1' of git://github.com/jnavila/git (b8068f1)
   1. "$MERGE_TOOLS_DIR/vimdiff"