mergetools / gvimdiffon commit Merge branch 'rs/apply-lose-prefix-length' into maint (c7759cd)
   1. "$MERGE_TOOLS_DIR/vimdiff"