mergetools / gvimdiffon commit Merge early parts from git://ozlabs.org/~paulus/gitk.git (ea0e524)
   1. "$MERGE_TOOLS_DIR/vimdiff"