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