mergetools / vimdiff3on commit Merge branch 'master' of github.com:jiangxin/git (61d93a2)
   1. "$MERGE_TOOLS_DIR/vimdiff"