Merge3

An open source algorithm for three way merging of text/binary files
Download

Merge3 Ranking & Summary

Advertisement

  • Rating:
  • License:
  • Freeware
  • Price:
  • FREE
  • Publisher Name:
  • Torsten Rueger
  • Publisher web site:
  • http://rubyforge.org/users/torsten/
  • Operating Systems:
  • Mac OS X
  • File Size:
  • 12 KB

Merge3 Tags


Merge3 Description

An open source algorithm for three way merging of text/binary files Three way merging tries to merge two independently edited documents into a consistent one. It does so using the original file and the two edited, thus three way merging.The merging algorithm is quite simple, and may be easily summarized as following the LineOfChange. Thus if one compares both files to the original and will find the common parts, one implicitly has found the added and deleted parts in both files.When all these parts are ordered, one walks along them, and wherever in the two edited files there is a change in the order, we take the bytes from there. Merge3 works similar to diff3 but uses move/insert instructions to merge cases diff3 can't. What's New in This Release: · Minor changes in tests


Merge3 Related Software