vsmerge issues with 14.0.1.2 and 14.0.0.7

[shadowbane]

Issue 1: vsmerge /? and vsmerge -h dont display anything for me.
Issue 2: Mouse scroll wheel in left or right pane does not keep the two panes in sync.

Also, could we get some documentation on what the "smart" merge option does that the non-smart version does not.

[Dan]

What platform are you on?

A couple of people have had the issue with not displaying usage.  Please PM me an email address and I will send you a vsmerge with some debug in it, hopefully we will get to the bottom of it.

I will have to look into the mouse issue.

Smart Merge uses the difference engine to try to resolve some conflicts.  An option was originally put in for this because it could affect performance, but it is very old and on a modern machine I would just leave it on.

[shadowbane]

Windows XP.

I sent the PM.

I have noticed that the panes stay in sync with vsdiff when I scroll, just not with vsmerge.

Thanks for looking at these.