mergetools / gvimdiff2on commit Sync with Git 1.8.3.4 (0bde8c0)
   1. "$MERGE_TOOLS_DIR/vimdiff"