mergetools / gvimdiff3on commit Merge gitk to pick up emergency build fix (8a3a681)
   1. "$MERGE_TOOLS_DIR/vimdiff"