mergetools / gvimdiffon commit Merge branch 'ib/t3700-add-chmod-x-updates' (09ee644)
   1. "$MERGE_TOOLS_DIR/vimdiff"