mergetools / gvimdiffon commit config.txt: move guitool.* to a separate file (2c31a83)
   1. "$MERGE_TOOLS_DIR/vimdiff"