Tagged Questions
4
votes
1answer
217 views
merge that works at word granularity instead of line
The old diff, patch, and merge programs, and their modern descendents in the form of version control systems work great for managing source code that can be edited concurrently by multiple people.
...