← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to mpdiff

Merge from multiparent

Show diffs side-by-side

added added

removed removed

Lines of Context:
mpdiff
 
1
#!/usr/bin/env python2.4
 
2
import sys
 
3
 
 
4
from multiparent import MultiParent
 
5
 
 
6
text = open(sys.argv[1], 'rb').readlines()
 
7
parents = [open(p, 'rb').readlines() for p in sys.argv[2:]]
 
8
sys.stdout.writelines(MultiParent.from_lines(text, parents).to_patch())