mergetools / gvimdiff3on commit Merge branch 'master' of git://ozlabs.org/~paulus/gitk (3cb8921)
   1. "$MERGE_TOOLS_DIR/vimdiff"