mergetools / gvimdiff2on commit completion: collapse extra --no-.. options (b221b5a)
   1. "$MERGE_TOOLS_DIR/vimdiff"