mergetools / gvimdiff2on commit Merge git://ozlabs.org/~paulus/gitk (ec418bc)
   1. "$MERGE_TOOLS_DIR/vimdiff"