mergetools / vimdiff3on commit Merge branch 'master' of git://ozlabs.org/~paulus/gitk (67de23d)
   1. "$MERGE_TOOLS_DIR/vimdiff"