Merge doesn't let me manually edit the merge result

[Adam Sills]

I just installed Vault 3.something and started testing it out. I did a simple branch/merge test (this is the main reason we want to leave sourcesafe) and it seems you're missing one key (to me anyway) feature that the SourceSafe merge has.

When doing a merge, two of my files had a conflict that couldn't be automatically merged. I did a merge on the two files and the merge window will only let me select the differences to apply and won't let me alter the resulting file by hand while inside the merge (something SourceSafe actually does really well).

Here's a pic of it. The /correct/ output on the merged file should be:

--
Version 4
This is a new line for branched version.
--


Notice how the merge tool won't let me enter the correct text. Repeat my same process with SourceSafe and it encounters the same problem, except I can manually type in the merged file to fix any problems their merge tool can't handle.

Am I missing something here? I can't let one of our developers here use this if they have to manually edit the file after performing a merge (i.e., the merge tool should let you do everything so you don't have to remember changes that are necessary to apply after the merge, since that's what a visual merge tool is for in the first place).[/img]

[dan]

Unfortunately, the merge tool doesn't allow editing yet. However, you can specify a different merge tool that does allow it, if this is a stumbling block.