mergetools / gvimdiff2on commit config.txt: move pull-config.txt to config/ (7f50a49)
   1. "$MERGE_TOOLS_DIR/vimdiff"