mergetools / vimdiff3on commit update-index: add test for chmod flags (22433ce)
   1. "$MERGE_TOOLS_DIR/vimdiff"