gabriel-weaver / xutools

eXtended UNIX text-processing tools
GNU General Public License v3.0
44 stars 2 forks source link

semistructured merge: rethinking merge in revision control systems #4

Open gabriel-weaver opened 12 years ago

gabriel-weaver commented 12 years ago

http://dl.acm.org/citation.cfm?id=2025141&dl=ACM&coll=DL&CFID=58850723&CFTOKEN=65129233