mergetools / gvimdiffon commit Merge branch 'cn/bom-in-gitignore' into maint (8a1d897)
   1. "$MERGE_TOOLS_DIR/vimdiff"