I have 3 text files:
Is there any merge/diff tool to produce Branch B, version i (Bi) with the following rules:
I tried DiffMerge from SourceGear Vault, but could not find such automated option.
This wiki article did not help either:
en.wikipedia.org/wiki/Merge_(revision_control)
Our tool ECMerge should do that (use Ai-1 as ancestor, Ai as left, Bi-1 as right, and specify Bi as "result location"). You can do that at file or folder level. If you want no attempt to merge inside the file, and directly report a conflict in case of any Ai<>Ai-1<>Bi use the Text Comparison/File Merges/Surround changes: all.
Some tools with no "production" capabilities might do it as well by first copying the Bi-1 version to Bi and then provoking a 3-way merge on Ai/Bi with Ai-1 as ancestor.