mergetools / gvimdiff2on commit Merge branch 'fr_2.18_rnd3' of git://github.com/jnavila/git (ee4286e)
   1. "$MERGE_TOOLS_DIR/vimdiff"