mergetools / gvimdiff2on commit Merge branch 'rs/apply-lose-prefix-length' into next (6ce0dbb)
   1. "$MERGE_TOOLS_DIR/vimdiff"