mergetools / gvimdiff2on commit Start preparing for Git 2.0 (384364b)
   1. "$MERGE_TOOLS_DIR/vimdiff"