SiberMerge

SiberMerge is a differencing and merging tool. SiberMerge can compare files, presenting differences in a visual text format that is easy to understand and handle.

Power users need a tool for identifying differences between files quickly and easily so that they can focus on more productive tasks. 

SiberMerge lets you compare XML, source code files, or other multi-line text files quickly, and then merge changes easily.

Comparing a pair of files is easy. SiberMerge opens them side by side. Differences are identified visually so you can see what specific parts are different. SiberMerge synchronizes the scrolling of the two documents to keep matches close for comparison so you can easily locate visually the corresponding differences.

Three-way merges take the original version of a file and two separate versions, and merge both sets of changes back into a new file. The changes of each separate version are determined by comparing each version with the original. The 3-way merge automatically applies all the changes (which are not overlapping) from each version. Then, if any changes were overlapping, those are brought to the attention of the merge operator for resolution.

Lori MacVittie at www.networkcomputing.com said while comparing merge products, "The most robust of these offerings is from SiberLogic, whose SiberMerge product is integrated with its VCS. With SiberMerge not only could we compare two different revisions, but we could compare both of the revisions simultaneously with a common ancestor. This feature is especially helpful when attempting to merge branched files."