"Resolve Merge" in 3rd-party diff/merge

[stevek2]

Could I make a feature request to change this? Maybe an option in the diff/merge tab about how or whether the client prompts for "Resolve Merge"?

Thanks!

[jeremy_sg]

Done.

F:13794

[jeffhostetler]

So until we get a chance to fix this....

So, if I'm reading this correctly, if one were to create a shell script that just happened to
have "sgdm" in the filename (such as "fake_sgdm.sh" or "fake_sgdm.bat" or ....) and all
it did was exec (or run/wait for) the third-party tool (and update the third-party settings
in the vault dialog to use the script instead of the tool directly), then one might get the
desired behavior....

All the usual YMMV disclaimers apply...
jeff