mergetools / gvimdiffon commit request-pull: resurrect for-linus -> tags/for-linus DWIM (d952cbb)
   1. "$MERGE_TOOLS_DIR/vimdiff"