mergetools / vimdiff2on commit cherry-pick: demonstrate option amnesia (36b0503)
   1. "$MERGE_TOOLS_DIR/vimdiff"