mergetools / vimdiff3on commit merge: pass aggressive when rename detection is turned off (6f10a09)
   1. "$MERGE_TOOLS_DIR/vimdiff"