mergetools / vimdiff3on commit config.txt: move mergetool.* to a separate file (ea24a76)
   1. "$MERGE_TOOLS_DIR/vimdiff"