mergetools / gvimdiffon commit git potty: restore environments after alias expansion (c056261)
   1. "$MERGE_TOOLS_DIR/vimdiff"