mergetools / gvimdiffon commit Merge git://ozlabs.org/~paulus/gitk (81d645d)
   1. "$MERGE_TOOLS_DIR/vimdiff"