mergetools / vimdiff2on commit cygwin: stop forcing core.filemode=false (c28facd)
   1. "$MERGE_TOOLS_DIR/vimdiff"