mergetools / gvimdiffon commit config.txt: move remote.* to a separate file (99fce39)
   1. "$MERGE_TOOLS_DIR/vimdiff"