mergetools / vimdiff2on commit Merge branch 'fix_fr' of git://github.com/jnavila/git (e890b29)
   1. "$MERGE_TOOLS_DIR/vimdiff"