Merge Text Files: Combine, Diff, and Resolve Conflicts Online