Felipe Contreras <felipe.contreras@xxxxxxxxx> writes: > Right, althought the user can't configure otherwise, and the default 7, > it can't hurt to add it. Yes, that would make it certain that the code would survive the change in the underlying xmerge part of the system. I am still not sure what the right plan to deal with conflicts recorded in the virtual ancestor. Do we just close our eyes and ignore it? An easy way out may be to give an command line override so that users can easily re-run mergetool with the feature disabled only for a single invocation that went wrong, which would make it less likely that users disable the feature permanently upon seeing just one case of the new logic getting confused.
