mergetools / gvimdiff3on commit make update-server-info more robust (d38379e)
   1. "$MERGE_TOOLS_DIR/vimdiff"